diff --git a/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2 b/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
index 48f214860..140a09683 100644
--- a/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
+++ b/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the barbican project
diff --git a/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2 b/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
index 473ff0598..2ac343353 100644
--- a/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
+++ b/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the cinder project
diff --git a/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2 b/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
index 59971a859..8426446c2 100644
--- a/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
+++ b/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set source = fetch_source('https://tarballs.openstack.org/designate-tempest-plugin/designate-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the designate project
diff --git a/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2 b/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2
index 2d0234054..ce283e650 100644
--- a/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2
+++ b/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the heat project
diff --git a/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2 b/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2
index ec409c398..156b584f7 100644
--- a/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2
+++ b/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2pkg('ironic-tempest-plugin') }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the ironic project
diff --git a/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2 b/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2
index d60e3b383..5baa28be4 100644
--- a/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2
+++ b/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the keystone project
diff --git a/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2 b/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2
index 6ac564790..46eb37369 100644
--- a/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2
+++ b/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the magnum project
diff --git a/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2 b/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2
index fb69f8bc1..3c5c27314 100644
--- a/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2
+++ b/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set source=fetch_source('https://tarballs.openstack.org/manila-tempest-plugin/manila-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 
-Name:          {{ py2pkg('manila-tempest-plugin') }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the manila project
diff --git a/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2 b/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2
index 474df4a38..2a09db8cf 100644
--- a/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2
+++ b/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the monasca project
diff --git a/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2 b/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2
index 656d259e8..977fd030e 100644
--- a/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2
+++ b/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the neutron project
diff --git a/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 b/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2
index 3f70791b2..a65cb5726 100644
--- a/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2
+++ b/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the os-win project
diff --git a/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2 b/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2
index 0de3393fc..10ea54c06 100644
--- a/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2
+++ b/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2
@@ -3,7 +3,7 @@
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
-Name:          {{ py2name() }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the zaqar project