diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 5f9a355d53..76a2bbaae3 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -42,7 +42,7 @@ class openstack_project::gerrit (
     ensure => present,
   }
 
-  class { 'gerrit':
+  class { '::gerrit':
     # opinions
     enable_melody => 'true',
     melody_session => 'true',
diff --git a/modules/openstack_project/manifests/jclouds_slave.pp b/modules/openstack_project/manifests/jclouds_slave.pp
index 881c6ffb8d..d4dba47d55 100644
--- a/modules/openstack_project/manifests/jclouds_slave.pp
+++ b/modules/openstack_project/manifests/jclouds_slave.pp
@@ -3,7 +3,7 @@
 class openstack_project::jclouds_slave {
   include openstack_project::base
 
-  class { 'jenkins_slave':
+  class { '::jenkins_slave':
     ssh_key => "",
     user => false
   }
diff --git a/modules/openstack_project/manifests/jenkins_slave.pp b/modules/openstack_project/manifests/jenkins_slave.pp
index d933af693e..f03993b4f0 100644
--- a/modules/openstack_project/manifests/jenkins_slave.pp
+++ b/modules/openstack_project/manifests/jenkins_slave.pp
@@ -1,10 +1,10 @@
 class openstack_project::jenkins_slave {
   include tmpreaper
   include apt::unattended-upgrades
-  class { 'openstack_server':
+  class { 'openstack_project::server':
     iptables_public_tcp_ports => []
   }
-  class { 'jenkins_slave':
+  class { '::jenkins_slave':
     ssh_key => $openstack_project::jenkins_ssh_key
   }
 }
diff --git a/modules/openstack_project/manifests/planet.pp b/modules/openstack_project/manifests/planet.pp
index a9eb369e37..0ab42191fc 100644
--- a/modules/openstack_project/manifests/planet.pp
+++ b/modules/openstack_project/manifests/planet.pp
@@ -2,7 +2,7 @@ class openstack_project::planet {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80]
   }
-  include planet
+  include ::planet
 
   planet::site { "openstack":
     git_url => "https://github.com/openstack/openstack-planet.git"
diff --git a/modules/openstack_project/manifests/pypi.pp b/modules/openstack_project/manifests/pypi.pp
index 95bf1c49aa..3b5c741dc5 100644
--- a/modules/openstack_project/manifests/pypi.pp
+++ b/modules/openstack_project/manifests/pypi.pp
@@ -1,6 +1,6 @@
 class openstack_project::pypi {
   # include jenkins slave so that build deps are there for the pip download
-  class { 'jenkins_slave':
+  class { '::jenkins_slave':
     ssh_key => "",
     user => false
   }
diff --git a/modules/openstack_project/manifests/slave_template.pp b/modules/openstack_project/manifests/slave_template.pp
index acecde6ee5..f9b4917f42 100644
--- a/modules/openstack_project/manifests/slave_template.pp
+++ b/modules/openstack_project/manifests/slave_template.pp
@@ -2,7 +2,7 @@ class openstack_project::slave_template {
   class { 'openstack_project::template':
     iptables_public_tcp_ports => []
   }
-  class { 'jenkins_slave':
+  class { '::jenkins_slave':
     ssh_key => $openstack_project::jenkins_ssh_key,
     sudo => true,
     bare => true