diff --git a/manifests/site.pp b/manifests/site.pp
index e88cda2fd9..c301949621 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -675,7 +675,7 @@ node 'proposal.slave.openstack.org' {
 # Node-OS: precise
 node 'pypi.slave.openstack.org' {
   include openstack_project
-  class { 'openstack_project::pypi_slave':
+  class { 'openstack_project::release_slave':
     pypi_username          => 'openstackci',
     pypi_password          => hiera('pypi_password', 'XXX'),
     jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
diff --git a/modules/openstack_project/manifests/pypi_slave.pp b/modules/openstack_project/manifests/release_slave.pp
similarity index 94%
rename from modules/openstack_project/manifests/pypi_slave.pp
rename to modules/openstack_project/manifests/release_slave.pp
index a8dba4e52c..1eb0646504 100644
--- a/modules/openstack_project/manifests/pypi_slave.pp
+++ b/modules/openstack_project/manifests/release_slave.pp
@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# Class to install dependencies for uploading python packages to pypi and
-# maven repositories
+# Class to install dependencies for uploading releases to pypi, maven and
+# similar external repositories
 #
-class openstack_project::pypi_slave (
+class openstack_project::release_slave (
   $pypi_password,
   $jenkins_ssh_public_key,
   $pypi_username = 'openstackci',