diff --git a/python-jaraco-collections.spec b/python-jaraco-collections.spec
index 8c9dbdc..7516c2e 100644
--- a/python-jaraco-collections.spec
+++ b/python-jaraco-collections.spec
@@ -2,7 +2,7 @@
 
 Name:           python-jaraco-collections
 Version:        3.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection objects similar to those in stdlib by jaraco
 
 License:        MIT
@@ -33,20 +33,28 @@ BuildRequires:  python3dist(six) >= 1.7.0
 %description
 %{summary}
 
-%package -n     python3-%{pypi_name}
+%package -n     python3-jaraco-collections
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
  
-Requires:       python3dist(jaraco.classes)
-Requires:       python3dist(jaraco.packaging) >= 3.2
-Requires:       python3dist(jaraco.text)
-Requires:       python3dist(six) >= 1.7.0
-%description -n python3-%{pypi_name}
+Requires:       python3-jaraco
+
+# The package name was changed. Obsolete the previous
+# name to provide a clean upgrade path.
+# Remove in Fedora >= 36
+Obsoletes:      python3-jaraco.collections < 3.0.0-3
+
+%description -n python3-jaraco-collections
 %{summary}
 
-%package -n python-%{pypi_name}-doc
+%package -n python-jaraco-collections-doc
 Summary:        jaraco.collections documentation
-%description -n python-%{pypi_name}-doc
+
+# The package name was changed. Obsolete the previous
+# name to provide a clean upgrade path.
+# Remove in Fedora >= 36
+Obsoletes:      python-jaraco.collections-doc < 3.0.0-3
+
+%description -n python-jaraco-collections-doc
 Documentation for jaraco.collections
 
 %prep
@@ -69,17 +77,24 @@ rm -rf html/.{doctrees,buildinfo}
 %install
 %py3_install
 
-%files -n python3-%{pypi_name}
+%files -n python3-jaraco-collections
 %license LICENSE
 %doc README.rst
-%{python3_sitelib}/jaraco
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+# These excludes are provided by python3-jaraco
+%pycached %exclude %{python3_sitelib}/jaraco/__init__.py
+%pycached %{python3_sitelib}/jaraco/collections.py
+%{python3_sitelib}/jaraco.collections-%{version}-py%{python3_version}.egg-info/
 
-%files -n python-%{pypi_name}-doc
+%files -n python-jaraco-collections-doc
 %doc html
 %license LICENSE
 
 %changelog
+* Fri Jun 26 2020 Charalampos Stratakis <cstratak@redhat.com> - 3.0.0-3
+- Fix a file conflict with python3-jaraco
+- Rename the binary rpms to conform to the packaging guidelines
+- Misc packaging fixes
+
 * Fri Jun 19 2020 Matthias Runge <mrunge@redhat.com> - 3.0.0-2
 - review feedback: fix license, remove (wrong) conflict