diff --git a/python-jaraco-functools.spec b/python-jaraco-functools.spec
index 5bf8970..2874e70 100644
--- a/python-jaraco-functools.spec
+++ b/python-jaraco-functools.spec
@@ -1,22 +1,23 @@
 # Created by pyp2rpm-3.3.2
-%global pypi_name jaraco-functools
+%global pypi_name jaraco.functools
+%global pkg_name jaraco-functools
 # Fedora doesn't have all the docs deps yet
 %bcond_with docs
 
-Name:           python-%{pypi_name}
+Name:           python-%{pkg_name}
 Version:        2.0
 Release:        1%{?dist}
 Summary:        Functools like those found in stdlib
 
 License:        MIT
 URL:            https://github.com/jaraco/jaraco.functools
-Source0:        %{pypi_source jaraco.functools}
+Source0:        %{pypi_source %{pypi_name}}
 BuildArch:      noarch
  
 %description
 Functools like those found in stdlib
 
-%package -n python3-%{pypi_name}
+%package -n python3-%{pkg_name}
 Summary:        %{summary}
 Requires:       python3-jaraco
 
@@ -29,32 +30,36 @@ BuildRequires:  python3dist(pytest-flake8)
 BuildRequires:  python3dist(setuptools)
 BuildRequires:  python3dist(setuptools-scm) >= 1.15.0
 BuildRequires:  python3dist(six)
-%{?python_provide:%python_provide python3-%{pypi_name}}
+%{?python_provide:%python_provide python3-%{pkg_name}}
 
-%description -n python3-%{pypi_name}
+%description -n python3-%{pkg_name}
 Functools like those found in stdlib
 
 %if %{with docs}
-BuildRequires:  python3dist(jaraco.packaging) >= 3.2
-BuildRequires:  python3dist(rst.linker) >= 1.9
-BuildRequires:  python3dist(sphinx)
-%package -n python-%{pypi_name}-doc
+%package -n python-%{pkg_name}-doc
 Summary:        jaraco-functools documentation
-%description -n python-%{pypi_name}-doc
+
+BuildRequires:  python3dist(jaraco-packaging) >= 3.2
+BuildRequires:  python3dist(rst-linker) >= 1.9
+BuildRequires:  python3dist(sphinx)
+
+%description -n python-%{pkg_name}-doc
 Documentation for jaraco-functools
 %endif
 
 %prep
 %autosetup -n jaraco.functools-%{version}
 # Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+rm -rf jaraco.functools.egg-info
+# rename package with a -
+sed -i 's/%{pypi_name}/%{pkg_name}/' setup.cfg
 
 %build
 %py3_build
 
 %if %{with docs}
 # generate html docs 
-PYTHONPATH=${PWD} sphinx-build-3 docs html
+PYTHONPATH=${PWD} sphinx-build docs html
 # remove the sphinx-build leftovers
 rm -rf html/.{doctrees,buildinfo}
 %endif
@@ -68,7 +73,7 @@ rm -rf html/.{doctrees,buildinfo}
 # AttributeError: 'Application' object has no attribute 'make_notifier'
 # LANG=C.utf-8 %%{__python3} -m pytest --ignore=build
 
-%files -n python3-%{pypi_name}
+%files -n python3-%{pkg_name}
 %license LICENSE
 %doc README.rst
 # These excludes are provided by python3-jaraco
@@ -76,10 +81,10 @@ rm -rf html/.{doctrees,buildinfo}
 %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_functools-%{version}-py?.?.egg-info
 
 %if %{with docs}
-%files -n python-%{pypi_name}-doc
+%files -n python-%{pkg_name}-doc
 %doc html
 %license LICENSE
 %endif