diff --git a/openstack/castellan/castellan.spec.j2 b/openstack/castellan/castellan.spec.j2
index f9c44c5cc..e492894c8 100644
--- a/openstack/castellan/castellan.spec.j2
+++ b/openstack/castellan/castellan.spec.j2
@@ -30,7 +30,7 @@ BuildArch:      noarch
 %description
 Generic Key Manager interface for OpenStack.
 
-%package -n python3-castellan
+%package -n {{ py2name(py_versions='py3') }}
 Summary:        Generic Key Manager interface for OpenStack
 Requires:       {{ py3('Babel') }}
 Requires:       {{ py3('python-barbicanclient') }}
@@ -44,7 +44,7 @@ Requires:       {{ py3('oslo.utils') }}
 Requires:       {{ py3('requests') }}
 Requires:       {{ py3('stevedore') }}
 
-%description -n python3-castellan
+%description -n {{ py2name(py_versions='py3') }}
 Generic Key Manager interface for OpenStack.
 
 This package includes the Python 3.x module.
@@ -77,7 +77,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 %{openstack_stestr_run}
 
-%files -n python3-castellan
+%files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
 %{python3_sitelib}/castellan
 %{python3_sitelib}/*.egg-info
diff --git a/openstack/keystonemiddleware/keystonemiddleware.spec.j2 b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
index 25d7d043f..4cd55cf51 100644
--- a/openstack/keystonemiddleware/keystonemiddleware.spec.j2
+++ b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
@@ -42,7 +42,7 @@ and authorization features to web services other than Keystone
 The most prominent module is keystonemiddleware.auth_token. This package
 does not expose any CLI or Python API features.
 
-%package -n python3-keystonemiddleware
+%package -n {{ py2name(py_versions='py3') }}
 Summary:        Middleware for OpenStack Identity
 Requires:       {{ py3('WebOb') }}
 Requires:       {{ py3('keystoneauth1') }}
@@ -59,7 +59,7 @@ Requires:       {{ py3('pycadf') }}
 Requires:       {{ py3('python-memcached') }}
 Requires:       {{ py3('requests') }}
 
-%description -n python3-keystonemiddleware
+%description -n {{ py2name(py_versions='py3') }}
 This package contains middleware modules designed to provide authentication
 and authorization features to web services other than Keystone
 The most prominent module is keystonemiddleware.auth_token. This package
@@ -97,7 +97,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 rm -v keystonemiddleware/tests/unit/audit/test_logging_notifier.py
 %{openstack_stestr_run}
 
-%files -n python3-keystonemiddleware
+%files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
 %doc ChangeLog README.rst
 %{python3_sitelib}/{{ pypi_name }}
diff --git a/openstack/metalsmith/metalsmith.spec.j2 b/openstack/metalsmith/metalsmith.spec.j2
index f78f59eb3..3678a388f 100644
--- a/openstack/metalsmith/metalsmith.spec.j2
+++ b/openstack/metalsmith/metalsmith.spec.j2
@@ -24,7 +24,7 @@ BuildArch:      noarch
 Simple Python library and CLI tool to provision bare metal machines using
 OpenStack Ironic.
 
-%package -n python3-metalsmith
+%package -n {{ py2name(py_versions='py3') }}
 Summary:        Bare metal provisioner using Ironic
 Requires:       {{ py3('ansible') }}
 Requires:       {{ py3('PrettyTable') }}
@@ -32,7 +32,7 @@ Requires:       {{ py3('openstacksdk') }}
 Requires:       {{ py3('pbr') }}
 Requires:       {{ py3('requests') }}
 
-%description -n python3-metalsmith
+%description -n {{ py2name(py_versions='py3') }}
 Simple Python library and CLI tool to provision bare metal machines using
 OpenStack Ironic.
 
@@ -72,7 +72,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 %{openstack_stestr_run}
 
-%files -n python3-metalsmith
+%files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
 %{_bindir}/metalsmith
 %{python3_sitelib}/metalsmith
diff --git a/openstack/sushy/sushy.spec.j2 b/openstack/sushy/sushy.spec.j2
index 2ef0630d6..2f35621f9 100644
--- a/openstack/sushy/sushy.spec.j2
+++ b/openstack/sushy/sushy.spec.j2
@@ -27,14 +27,14 @@ BuildArch:      noarch
 %description
 Sushy is a Python library to communicate with `Redfish` based systems.
 
-%package -n python3-sushy
+%package -n {{ py2name(py_versions='py3') }}
 Summary:        Python library to communicate with Redfish based systems
 Requires:       {{ py3('pbr') }}
 Requires:       {{ py3('python-dateutil') }}
 Requires:       {{ py3('requests') }}
 Requires:       {{ py3('stevedore') }}
 
-%description -n python3-sushy
+%description -n {{ py2name(py_versions='py3') }}
 Sushy is a Python library to communicate with `Redfish` based systems.
 
 %package -n {{ py2name() }}-doc
@@ -63,7 +63,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 %{openstack_stestr_run}
 
-%files -n python3-sushy
+%files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
 %doc AUTHORS ChangeLog README.rst
 %{python3_sitelib}/sushy*
diff --git a/openstack/taskflow/taskflow.spec.j2 b/openstack/taskflow/taskflow.spec.j2
index 11cedf44a..cd97586f1 100644
--- a/openstack/taskflow/taskflow.spec.j2
+++ b/openstack/taskflow/taskflow.spec.j2
@@ -46,7 +46,7 @@ BuildArch:      noarch
 A library to do [jobs, tasks, flows] in a HA manner using
 different backends to be used with OpenStack projects.
 
-%package -n python3-taskflow
+%package -n {{ py2name(py_versions='py3') }}
 Summary:        Taskflow structured state management library
 Requires:       {{ py3('automaton') }}
 Requires:       {{ py3('cachetools') }}
@@ -62,7 +62,7 @@ Requires:       {{ py3('six') }}
 Requires:       {{ py3('stevedore') }}
 Requires:       {{ py3('tenacity') }}
 
-%description -n python3-taskflow
+%description -n {{ py2name(py_versions='py3') }}
 A library to do [jobs, tasks, flows] in a HA manner using
 different backends to be used with OpenStack projects.
 
@@ -97,7 +97,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 %{openstack_stestr_run}
 
-%files -n python3-taskflow
+%files -n {{ py2name(py_versions='py3') }}
 %doc README.rst
 %license LICENSE
 %{python3_sitelib}/{{ pypi_name }}
diff --git a/openstack/tooz/tooz.spec.j2 b/openstack/tooz/tooz.spec.j2
index b8f35f700..ab8f315a1 100644
--- a/openstack/tooz/tooz.spec.j2
+++ b/openstack/tooz/tooz.spec.j2
@@ -37,7 +37,7 @@ The Tooz project aims at centralizing the most common distributed primitives
 like group membership protocol, lock service and leader election by providing
 a coordination API helping developers to build distributed applications.
 
-%package -n python3-tooz
+%package -n {{ py2name(py_versions='py3') }}
 Summary:        Coordination library for distributed systems
 Requires:       {{ py3('fasteners') }}
 Requires:       {{ py3('futurist') }}
@@ -48,7 +48,7 @@ Requires:       {{ py3('stevedore') }}
 Requires:       {{ py3('tenacity') }}
 Requires:       {{ py3('voluptuous') }}
 
-%description -n python3-tooz
+%description -n {{ py2name(py_versions='py3') }}
 The Tooz project aims at centralizing the most common distributed primitives
 like group membership protocol, lock service and leader election by providing
 a coordination API helping developers to build distributed applications.
@@ -92,7 +92,7 @@ bash run-tests.sh
 %install
 %{py3_install}
 
-%files -n python3-tooz
+%files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
 %{python3_sitelib}/{{ pypi_name }}
 %{python3_sitelib}/{{ pypi_name }}-*.egg-info