diff --git a/python-jaraco-functools.spec b/python-jaraco-functools.spec
index b794c1f..fadc948 100644
--- a/python-jaraco-functools.spec
+++ b/python-jaraco-functools.spec
@@ -39,8 +39,8 @@ Functools like those found in stdlib
 %package -n python-%{pkg_name}-doc
 Summary:        jaraco-functools documentation
 
-BuildRequires:  python3dist(jaraco-packaging) >= 3.2
-BuildRequires:  python3dist(rst-linker) >= 1.9
+BuildRequires:  python3dist(jaraco.packaging) >= 3.2
+BuildRequires:  python3dist(rst.linker) >= 1.9
 BuildRequires:  python3dist(sphinx)
 
 %description -n python-%{pkg_name}-doc
@@ -51,8 +51,6 @@ Documentation for jaraco-functools
 %autosetup -n jaraco.functools-%{version}
 # Remove bundled egg-info
 rm -rf jaraco.functools.egg-info
-# rename package with a -
-sed -i 's/%{pypi_name}/%{pkg_name}/' setup.cfg
 
 %build
 %py3_build
@@ -77,11 +75,11 @@ rm -rf html/.{doctrees,buildinfo}
 %license LICENSE
 %doc README.rst
 # These excludes are provided by python3-jaraco
-%exclude %{python3_sitelib}/jaraco/__init__*
-%exclude %{python3_sitelib}/jaraco/__pycache__/__init__*
+#%exclude %{python3_sitelib}/jaraco/__init__*
+#%exclude %{python3_sitelib}/jaraco/__pycache__/__init__*
 %{python3_sitelib}/jaraco/functools*
-%{python3_sitelib}/jaraco/__pycache__/functools*
-%{python3_sitelib}/jaraco_functools-%{version}-py?.?.egg-info
+#%{python3_sitelib}/jaraco/__pycache__/functools*
+%{python3_sitelib}/jaraco.functools-%{version}-py?.?.egg-info
 
 %if %{with docs}
 %files -n python-%{pkg_name}-doc