diff --git a/manifests/certmonger/etcd.pp b/manifests/certmonger/etcd.pp
index 0bddfb482..f0566218f 100644
--- a/manifests/certmonger/etcd.pp
+++ b/manifests/certmonger/etcd.pp
@@ -42,7 +42,7 @@ class tripleo::certmonger::etcd (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   $postsave_cmd = 'systemctl reload etcd'
   certmonger_certificate { 'etcd' :
diff --git a/manifests/certmonger/haproxy.pp b/manifests/certmonger/haproxy.pp
index 455fb391f..0f3735bf8 100644
--- a/manifests/certmonger/haproxy.pp
+++ b/manifests/certmonger/haproxy.pp
@@ -58,8 +58,8 @@ define tripleo::certmonger::haproxy (
   $principal     = undef,
   $postsave_cmd  = undef,
 ){
-    include ::certmonger
-    include ::haproxy::params
+    include certmonger
+    include haproxy::params
     if $certmonger_ca == 'local' {
       if defined(Class['::haproxy']) {
         Class['::tripleo::certmonger::ca::local'] ~> Class['::haproxy']
diff --git a/manifests/certmonger/httpd.pp b/manifests/certmonger/httpd.pp
index 18c2de2e6..aa7c98220 100644
--- a/manifests/certmonger/httpd.pp
+++ b/manifests/certmonger/httpd.pp
@@ -53,8 +53,8 @@ define tripleo::certmonger::httpd (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
-  include ::apache::params
+  include certmonger
+  include apache::params
 
   if $dnsnames {
     $dnsnames_real = $dnsnames
diff --git a/manifests/certmonger/libvirt.pp b/manifests/certmonger/libvirt.pp
index 8ce003778..58cf70951 100644
--- a/manifests/certmonger/libvirt.pp
+++ b/manifests/certmonger/libvirt.pp
@@ -52,8 +52,8 @@ define tripleo::certmonger::libvirt (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
-  include ::nova::params
+  include certmonger
+  include nova::params
 
   $postsave_cmd_real = pick($postsave_cmd, "systemctl reload ${::nova::params::libvirt_service_name}")
   certmonger_certificate { $name :
diff --git a/manifests/certmonger/libvirt_vnc.pp b/manifests/certmonger/libvirt_vnc.pp
index dcdd1aa04..60540ba28 100644
--- a/manifests/certmonger/libvirt_vnc.pp
+++ b/manifests/certmonger/libvirt_vnc.pp
@@ -58,8 +58,8 @@ define tripleo::certmonger::libvirt_vnc (
   $cacertfile       = undef,
   $notify_service   = undef,
 ) {
-  include ::certmonger
-  include ::nova::params
+  include certmonger
+  include nova::params
 
   $notify_service_real = pick($notify_service, $::nova::params::libvirt_service_name)
 
diff --git a/manifests/certmonger/metrics_qdr.pp b/manifests/certmonger/metrics_qdr.pp
index d266e716f..3f010a7e7 100644
--- a/manifests/certmonger/metrics_qdr.pp
+++ b/manifests/certmonger/metrics_qdr.pp
@@ -54,8 +54,8 @@ class tripleo::certmonger::metrics_qdr (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
-  include ::qdr::params
+  include certmonger
+  include qdr::params
 
   ensure_resource('file', '/usr/bin/certmonger-metrics-qdr-refresh.sh', {
     source  => 'puppet:///modules/tripleo/certmonger-metrics-qdr-refresh.sh',
diff --git a/manifests/certmonger/mysql.pp b/manifests/certmonger/mysql.pp
index cadcf455b..6bff72ab8 100644
--- a/manifests/certmonger/mysql.pp
+++ b/manifests/certmonger/mysql.pp
@@ -55,7 +55,7 @@ class tripleo::certmonger::mysql (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   certmonger_certificate { 'mysql' :
     ensure       => 'present',
diff --git a/manifests/certmonger/neutron.pp b/manifests/certmonger/neutron.pp
index 4260318c6..80b1d32c8 100644
--- a/manifests/certmonger/neutron.pp
+++ b/manifests/certmonger/neutron.pp
@@ -46,7 +46,7 @@ class tripleo::certmonger::neutron (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   ensure_resource('file', '/usr/bin/certmonger-neutron-dhcpd-refresh.sh', {
     source  => 'puppet:///modules/tripleo/certmonger-neutron-dhcpd-refresh.sh',
diff --git a/manifests/certmonger/neutron_ovn.pp b/manifests/certmonger/neutron_ovn.pp
index f86479a3c..c2f734730 100644
--- a/manifests/certmonger/neutron_ovn.pp
+++ b/manifests/certmonger/neutron_ovn.pp
@@ -46,7 +46,7 @@ class tripleo::certmonger::neutron_ovn (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   certmonger_certificate { 'neutron_ovn' :
     ensure       => 'present',
diff --git a/manifests/certmonger/novnc_proxy.pp b/manifests/certmonger/novnc_proxy.pp
index 037adf670..bfa530a63 100644
--- a/manifests/certmonger/novnc_proxy.pp
+++ b/manifests/certmonger/novnc_proxy.pp
@@ -55,8 +55,8 @@ class tripleo::certmonger::novnc_proxy (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
-  include ::nova::params
+  include certmonger
+  include nova::params
 
   $notify_service_real = pick($notify_service, $::nova::params::vncproxy_service_name)
 
diff --git a/manifests/certmonger/opendaylight.pp b/manifests/certmonger/opendaylight.pp
index bd2d3d981..6b5dffd38 100644
--- a/manifests/certmonger/opendaylight.pp
+++ b/manifests/certmonger/opendaylight.pp
@@ -47,7 +47,7 @@ class tripleo::certmonger::opendaylight (
   $postsave_cmd  = 'if systemctl -q is-active opendaylight; then systemctl restart opendaylight; else true; fi',
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   certmonger_certificate { 'opendaylight' :
     ensure       => 'present',
diff --git a/manifests/certmonger/openvswitch.pp b/manifests/certmonger/openvswitch.pp
index 4cf42c58e..ecc8325a8 100644
--- a/manifests/certmonger/openvswitch.pp
+++ b/manifests/certmonger/openvswitch.pp
@@ -47,7 +47,7 @@ class tripleo::certmonger::openvswitch (
   $postsave_cmd  = 'systemctl reload openvswitch',
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   certmonger_certificate { 'openvswitch' :
     ensure       => 'present',
diff --git a/manifests/certmonger/ovn_controller.pp b/manifests/certmonger/ovn_controller.pp
index c2ad9d3fc..935fb7c5f 100644
--- a/manifests/certmonger/ovn_controller.pp
+++ b/manifests/certmonger/ovn_controller.pp
@@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_controller (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   certmonger_certificate { 'ovn_controller' :
     ensure       => 'present',
diff --git a/manifests/certmonger/ovn_dbs.pp b/manifests/certmonger/ovn_dbs.pp
index 7d9d2a4b7..cf1dc66ec 100644
--- a/manifests/certmonger/ovn_dbs.pp
+++ b/manifests/certmonger/ovn_dbs.pp
@@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_dbs (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   certmonger_certificate { 'ovn_dbs' :
     ensure       => 'present',
diff --git a/manifests/certmonger/ovn_metadata.pp b/manifests/certmonger/ovn_metadata.pp
index 93476dc14..46f84c345 100644
--- a/manifests/certmonger/ovn_metadata.pp
+++ b/manifests/certmonger/ovn_metadata.pp
@@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_metadata (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   certmonger_certificate { 'ovn_metadata' :
     ensure       => 'present',
diff --git a/manifests/certmonger/qemu.pp b/manifests/certmonger/qemu.pp
index f6f23e02a..1b4d939d3 100644
--- a/manifests/certmonger/qemu.pp
+++ b/manifests/certmonger/qemu.pp
@@ -56,8 +56,8 @@ define tripleo::certmonger::qemu (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
-  include ::nova::params
+  include certmonger
+  include nova::params
 
   certmonger_certificate { $name :
     ensure       => 'present',
diff --git a/manifests/certmonger/rabbitmq.pp b/manifests/certmonger/rabbitmq.pp
index 3a2e40204..69f0fec26 100644
--- a/manifests/certmonger/rabbitmq.pp
+++ b/manifests/certmonger/rabbitmq.pp
@@ -47,7 +47,7 @@ class tripleo::certmonger::rabbitmq (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   ensure_resource('file', '/usr/bin/certmonger-rabbitmq-refresh.sh', {
     source  => 'puppet:///modules/tripleo/certmonger-rabbitmq-refresh.sh',
diff --git a/manifests/certmonger/redis.pp b/manifests/certmonger/redis.pp
index 449aa41e6..c26246fa8 100644
--- a/manifests/certmonger/redis.pp
+++ b/manifests/certmonger/redis.pp
@@ -54,7 +54,7 @@ class tripleo::certmonger::redis (
   $postsave_cmd  = undef,
   $principal     = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   ensure_resource('file', '/usr/bin/certmonger-redis-refresh.sh', {
     source  => 'puppet:///modules/tripleo/certmonger-redis-refresh.sh',
diff --git a/manifests/firewall/pre.pp b/manifests/firewall/pre.pp
index 6c03b65de..1cdc70612 100644
--- a/manifests/firewall/pre.pp
+++ b/manifests/firewall/pre.pp
@@ -29,7 +29,7 @@ class tripleo::firewall::pre(
 ){
 
   # ensure the correct packages are installed
-  include ::firewall
+  include firewall
 
   # defaults 'pre' rules
   tripleo::firewall::rule{ '000 accept related established rules':
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 130a2831f..278e19fe2 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -849,7 +849,7 @@ class tripleo::haproxy (
     $httplog = {}
   }
 
-  class { '::haproxy':
+  class { 'haproxy':
     service_manage   => $haproxy_service_manage,
     global_options   => merge($haproxy_global_options, $haproxy_daemonize, $haproxy_globals_override),
     defaults_options => merge($haproxy_defaults_options, $httplog, $haproxy_defaults_override),
@@ -888,7 +888,7 @@ class tripleo::haproxy (
     $haproxy_stats_ips_raw = union(any2array($controller_virtual_ip), any2array($haproxy_stats_bind_address))
     $haproxy_stats_ips = delete_undef_values($haproxy_stats_ips_raw)
 
-    class { '::tripleo::haproxy::stats':
+    class { 'tripleo::haproxy::stats':
       haproxy_listen_bind_param => $haproxy_listen_bind_param,
       ip                        => $haproxy_stats_ips,
       password                  => $haproxy_stats_password,
@@ -1277,7 +1277,7 @@ class tripleo::haproxy (
   }
 
   if $horizon {
-    class { '::tripleo::haproxy::horizon_endpoint':
+    class { 'tripleo::haproxy::horizon_endpoint':
       public_virtual_ip           => $public_virtual_ip,
       internal_ip                 => hiera('horizon_vip', $controller_virtual_ip),
       haproxy_listen_bind_param   => $haproxy_listen_bind_param,
@@ -1378,7 +1378,7 @@ class tripleo::haproxy (
       options           => $mysql_member_options_real,
     }
     if $manage_firewall {
-      include ::tripleo::firewall
+      include tripleo::firewall
       $mysql_firewall_rules = {
         '100 mysql_haproxy' => {
           'dport' => 3306,
@@ -1475,7 +1475,7 @@ class tripleo::haproxy (
       verifyhost        => false,
     }
     if $manage_firewall {
-      include ::tripleo::firewall
+      include tripleo::firewall
       $redis_firewall_rules = {
         '100 redis_haproxy' => {
           'dport' => 6379,
diff --git a/manifests/haproxy/endpoint.pp b/manifests/haproxy/endpoint.pp
index 9a8d206b3..46682fd13 100644
--- a/manifests/haproxy/endpoint.pp
+++ b/manifests/haproxy/endpoint.pp
@@ -272,7 +272,7 @@ define tripleo::haproxy::endpoint (
   }
 
   if $manage_firewall {
-    include ::tripleo::firewall
+    include tripleo::firewall
     # This block will construct firewall rules only when we specify
     # a port for the regular service and also the ssl port for the service.
     # It makes sure we're not trying to create TCP iptables rules where no port
diff --git a/manifests/haproxy/horizon_endpoint.pp b/manifests/haproxy/horizon_endpoint.pp
index 0cb511476..05e5d20cb 100644
--- a/manifests/haproxy/horizon_endpoint.pp
+++ b/manifests/haproxy/horizon_endpoint.pp
@@ -167,7 +167,7 @@ class tripleo::haproxy::horizon_endpoint (
     }
   }
   if $manage_firewall {
-    include ::tripleo::firewall
+    include tripleo::firewall
     $haproxy_horizon_firewall_rules = {
       '100 horizon_haproxy'     => {
         'dport' => 80,
diff --git a/manifests/host/sriov/numvfs_persistence.pp b/manifests/host/sriov/numvfs_persistence.pp
index 066105978..627ac7d72 100644
--- a/manifests/host/sriov/numvfs_persistence.pp
+++ b/manifests/host/sriov/numvfs_persistence.pp
@@ -24,7 +24,7 @@ define tripleo::host::sriov::numvfs_persistence(
   # Since reduce isn't available, we use recursion to iterate each entries of
   # "physical_interface:vfs" and accumulate the content that needs to be
   # written to the script file.
-  include ::stdlib
+  include stdlib
 
   if empty($vf_defs) {
     file { '/etc/sysconfig/allocate_vfs':
diff --git a/manifests/keepalived.pp b/manifests/keepalived.pp
index c2c660c28..e406ba829 100644
--- a/manifests/keepalived.pp
+++ b/manifests/keepalived.pp
@@ -118,7 +118,7 @@ class tripleo::keepalived (
     $keepalived_vrrp_script_real = $keepalived_vrrp_script
   }
 
-  class { '::keepalived': }
+  class { 'keepalived': }
   keepalived::vrrp_script { 'haproxy':
     name_is_process => $keepalived_name_is_process,
     script          => $keepalived_vrrp_script_real,
diff --git a/manifests/network/contrail/neutron_plugin.pp b/manifests/network/contrail/neutron_plugin.pp
index 36800cea2..2bf98b281 100644
--- a/manifests/network/contrail/neutron_plugin.pp
+++ b/manifests/network/contrail/neutron_plugin.pp
@@ -120,8 +120,8 @@ class tripleo::network::contrail::neutron_plugin (
   $package_ensure         = 'present',
 ) {
 
-  include ::neutron::deps
-  include ::neutron::params
+  include neutron::deps
+  include neutron::params
 
   validate_legacy(Array, 'validate_array', $contrail_extensions)
 
diff --git a/manifests/network/contrail/vrouter.pp b/manifests/network/contrail/vrouter.pp
index 37c7a7b21..d3731a0ee 100644
--- a/manifests/network/contrail/vrouter.pp
+++ b/manifests/network/contrail/vrouter.pp
@@ -173,7 +173,7 @@ class tripleo::network::contrail::vrouter (
     notify { 'cidr':
       message => $cidr,
     }
-    #include ::contrail::vrouter
+    #include contrail::vrouter
     # NOTE: it's not possible to use this class without a functional
     # contrail controller up and running
     if size($control_server) == 0 {
diff --git a/manifests/network/os_net_config.pp b/manifests/network/os_net_config.pp
index 75d7af34a..bc5a77d73 100644
--- a/manifests/network/os_net_config.pp
+++ b/manifests/network/os_net_config.pp
@@ -19,7 +19,7 @@
 #
 class tripleo::network::os_net_config {
 
-  include ::vswitch::ovs
+  include vswitch::ovs
   ensure_packages('os-net-config', { ensure => present })
 
   exec { 'os-net-config':
diff --git a/manifests/packages.pp b/manifests/packages.pp
index b0a69b921..58cc7e8c9 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -33,7 +33,7 @@ class tripleo::packages (
 ) {
 
   # required for stages
-  include ::stdlib
+  include stdlib
 
   # if both enable_install and enabled_upgrade are false *or* if we're in containers we noop package installations
   if (!str2bool($enable_install) and !str2bool($enable_upgrade)) or $::deployment_type == 'containers' {
diff --git a/manifests/packages/upgrades.pp b/manifests/packages/upgrades.pp
index a6ca1c8a4..92c238289 100644
--- a/manifests/packages/upgrades.pp
+++ b/manifests/packages/upgrades.pp
@@ -20,7 +20,7 @@
 class tripleo::packages::upgrades {
 
   # required for stages
-  include ::stdlib
+  include stdlib
 
   case $::osfamily {
     'RedHat': {
diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index 77af8bfbf..4404f240a 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -101,7 +101,7 @@ class tripleo::profile::base::aodh (
   if $step >= 4 or ($step >= 3 and $sync_db) {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::aodh' :
+    class { 'aodh' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
@@ -119,11 +119,11 @@ class tripleo::profile::base::aodh (
         'ssl'       => $oslomsg_notify_use_ssl_real,
       }),
     }
-    include ::aodh::auth
-    include ::aodh::config
-    include ::aodh::client
-    include ::aodh::db::sync
-    include ::aodh::logging
+    include aodh::auth
+    include aodh::config
+    include aodh::client
+    include aodh::db::sync
+    include aodh::logging
   }
 
 }
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index c649eceeb..7abd4d6ac 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -62,8 +62,8 @@ class tripleo::profile::base::aodh::api (
     $is_bootstrap = false
   }
 
-  include ::tripleo::profile::base::aodh
-  include ::tripleo::profile::base::aodh::authtoken
+  include tripleo::profile::base::aodh
+  include tripleo::profile::base::aodh::authtoken
 
   if $enable_internal_tls {
     if !$aodh_network {
@@ -79,9 +79,9 @@ class tripleo::profile::base::aodh::api (
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
     warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
-    include ::aodh::api
-    include ::tripleo::profile::base::apache
-    class { '::aodh::wsgi::apache':
+    include aodh::api
+    include tripleo::profile::base::apache
+    class { 'aodh::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/aodh/authtoken.pp b/manifests/profile/base/aodh/authtoken.pp
index 93c11f17a..eafbccab2 100644
--- a/manifests/profile/base/aodh/authtoken.pp
+++ b/manifests/profile/base/aodh/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::aodh::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::aodh::keystone::authtoken':
+    class { 'aodh::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp
index 4f7ffe5b1..f75ba46b4 100644
--- a/manifests/profile/base/aodh/evaluator.pp
+++ b/manifests/profile/base/aodh/evaluator.pp
@@ -32,7 +32,7 @@ class tripleo::profile::base::aodh::evaluator (
   $step                = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::aodh
+  include tripleo::profile::base::aodh
   if $enable_internal_tls {
     $tls_query_param = '?ssl=true'
   } else {
@@ -41,7 +41,7 @@ class tripleo::profile::base::aodh::evaluator (
 
   if $step >= 4 {
     warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
-    class { '::aodh::evaluator':
+    class { 'aodh::evaluator':
       coordination_url => join(['redis://:', hiera('aodh_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/', $tls_query_param]),
     }
   }
diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp
index 63ac0db40..27359440d 100644
--- a/manifests/profile/base/aodh/listener.pp
+++ b/manifests/profile/base/aodh/listener.pp
@@ -27,11 +27,11 @@ class tripleo::profile::base::aodh::listener (
   $step = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::aodh
+  include tripleo::profile::base::aodh
 
   if $step >= 4 {
     warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
-    include ::aodh::listener
+    include aodh::listener
   }
 
 }
diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp
index 819c5d2c6..9fbe3fb4b 100644
--- a/manifests/profile/base/aodh/notifier.pp
+++ b/manifests/profile/base/aodh/notifier.pp
@@ -27,11 +27,11 @@ class tripleo::profile::base::aodh::notifier (
   $step = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::aodh
+  include tripleo::profile::base::aodh
 
   if $step >= 4 {
     warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
-    include ::aodh::notifier
+    include aodh::notifier
   }
 
 }
diff --git a/manifests/profile/base/apache.pp b/manifests/profile/base/apache.pp
index 16c5371e4..521852afa 100644
--- a/manifests/profile/base/apache.pp
+++ b/manifests/profile/base/apache.pp
@@ -36,23 +36,23 @@ class tripleo::profile::base::apache(
   String  $status_listener        = '127.0.0.1:80',
   String  $mpm_module             = 'prefork',
 ) {
-  include ::apache::params
+  include apache::params
   # rhel8/fedora will be python3. See LP#1813053
   if ($::os['name'] == 'Fedora') or ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-    class { '::apache':
+    class { 'apache':
       mod_packages => merge($::apache::params::mod_packages, { 'wsgi' =>  'python3-mod_wsgi' }),
       mod_libs     => merge($::apache::params::mod_libs, { 'wsgi' => 'mod_wsgi_python3.so' }),
       mpm_module   => $mpm_module,
     }
   } else {
-    class { '::apache':
+    class { 'apache':
       mpm_module => $mpm_module,
     }
   }
   Service <| title == 'httpd' |> { provider => 'noop' }
 
-  include ::apache::mod::status
-  include ::apache::mod::ssl
+  include apache::mod::status
+  include apache::mod::ssl
   if $enable_status_listener {
     if !defined(Apache::Listen[$status_listener]) {
       ::apache::listen {$status_listener: }
diff --git a/manifests/profile/base/auditd.pp b/manifests/profile/base/auditd.pp
index 46eb5643c..bb40361bb 100644
--- a/manifests/profile/base/auditd.pp
+++ b/manifests/profile/base/auditd.pp
@@ -25,6 +25,6 @@ class tripleo::profile::base::auditd (
   $step  = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-      include ::auditd
+      include auditd
   }
 }
diff --git a/manifests/profile/base/barbican.pp b/manifests/profile/base/barbican.pp
index 7113fd072..26620c76d 100644
--- a/manifests/profile/base/barbican.pp
+++ b/manifests/profile/base/barbican.pp
@@ -29,8 +29,8 @@ class tripleo::profile::base::barbican (
 ) {
 
   if $step >= 3 {
-    include ::barbican
-    include ::barbican::config
-    include ::barbican::client
+    include barbican
+    include barbican::config
+    include barbican::client
   }
 }
diff --git a/manifests/profile/base/barbican/api.pp b/manifests/profile/base/barbican/api.pp
index ffc264ea8..c5c3348cc 100644
--- a/manifests/profile/base/barbican/api.pp
+++ b/manifests/profile/base/barbican/api.pp
@@ -132,15 +132,15 @@ class tripleo::profile::base::barbican::api (
     $tls_keyfile = undef
   }
 
-  include ::tripleo::profile::base::barbican
-  include ::tripleo::profile::base::barbican::authtoken
+  include tripleo::profile::base::barbican
+  include tripleo::profile::base::barbican::authtoken
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::tripleo::profile::base::barbican::backends
+    include tripleo::profile::base::barbican::backends
 
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::barbican::api':
+    class { 'barbican::api':
       sync_db                        => $sync_db,
       default_transport_url          => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
@@ -161,12 +161,12 @@ class tripleo::profile::base::barbican::api (
       multiple_secret_stores_enabled => true,
       enabled_secret_stores          => $::tripleo::profile::base::barbican::backends::enabled_secret_stores,
     }
-    include ::barbican::keystone::authtoken
-    include ::barbican::api::logging
-    include ::barbican::keystone::notification
-    include ::barbican::quota
-    include ::tripleo::profile::base::apache
-    class { '::barbican::wsgi::apache':
+    include barbican::keystone::authtoken
+    include barbican::api::logging
+    include barbican::keystone::notification
+    include barbican::quota
+    include tripleo::profile::base::apache
+    class { 'barbican::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/barbican/authtoken.pp b/manifests/profile/base/barbican/authtoken.pp
index 7c7b03808..08855ce0b 100644
--- a/manifests/profile/base/barbican/authtoken.pp
+++ b/manifests/profile/base/barbican/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::barbican::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::barbican::keystone::authtoken':
+    class { 'barbican::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/barbican/backends.pp b/manifests/profile/base/barbican/backends.pp
index 9f0c5d936..feb9d0274 100644
--- a/manifests/profile/base/barbican/backends.pp
+++ b/manifests/profile/base/barbican/backends.pp
@@ -54,28 +54,28 @@ class tripleo::profile::base::barbican::backends (
   $kmip_backend_enabled          = hiera('barbican_backend_kmip_enabled', false),
 ) {
   if $simple_crypto_backend_enabled {
-    include ::barbican::plugins::simple_crypto
+    include barbican::plugins::simple_crypto
     $backend1 = 'simple_crypto'
   } else {
     $backend1 = undef
   }
 
   if $dogtag_backend_enabled {
-    include ::barbican::plugins::dogtag
+    include barbican::plugins::dogtag
     $backend2 = 'dogtag'
   } else {
     $backend2 = undef
   }
 
   if $p11_crypto_backend_enabled {
-    include ::barbican::plugins::p11_crypto
+    include barbican::plugins::p11_crypto
     $backend3 = 'pkcs11'
   } else {
     $backend3 = undef
   }
 
   if $kmip_backend_enabled {
-    include ::barbican::plugins::kmip
+    include barbican::plugins::kmip
     $backend4 = 'kmip'
   } else {
     $backend4 = undef
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index 73feffee0..eaebf0b5c 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -112,7 +112,7 @@ class tripleo::profile::base::ceilometer (
 
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::ceilometer' :
+    class { 'ceilometer' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
@@ -153,7 +153,7 @@ class tripleo::profile::base::ceilometer (
         pipeline_publishers       => $pipeline_publishers,
       }
     }
-    include ::ceilometer::config
-    include ::ceilometer::logging
+    include ceilometer::config
+    include ceilometer::logging
   }
 }
diff --git a/manifests/profile/base/ceilometer/agent/notification.pp b/manifests/profile/base/ceilometer/agent/notification.pp
index 428600117..528ef24ec 100644
--- a/manifests/profile/base/ceilometer/agent/notification.pp
+++ b/manifests/profile/base/ceilometer/agent/notification.pp
@@ -26,12 +26,12 @@
 class tripleo::profile::base::ceilometer::agent::notification (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::ceilometer
-  include ::tripleo::profile::base::ceilometer::upgrade
+  include tripleo::profile::base::ceilometer
+  include tripleo::profile::base::ceilometer::upgrade
 
   if $step >= 4 {
-    include ::ceilometer::agent::auth
-    include ::ceilometer::agent::notification
+    include ceilometer::agent::auth
+    include ceilometer::agent::notification
   }
 
 }
diff --git a/manifests/profile/base/ceilometer/agent/polling.pp b/manifests/profile/base/ceilometer/agent/polling.pp
index 043b5cd9a..59bad5cab 100644
--- a/manifests/profile/base/ceilometer/agent/polling.pp
+++ b/manifests/profile/base/ceilometer/agent/polling.pp
@@ -54,10 +54,10 @@ class tripleo::profile::base::ceilometer::agent::polling (
   $redis_vip                 = hiera('redis_vip', undef),
   $step                      = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::ceilometer
+  include tripleo::profile::base::ceilometer
 
   if $central_namespace {
-    include ::tripleo::profile::base::ceilometer::upgrade
+    include tripleo::profile::base::ceilometer::upgrade
   }
 
   if $enable_internal_tls {
@@ -67,8 +67,8 @@ class tripleo::profile::base::ceilometer::agent::polling (
   }
 
   if $step >= 4 {
-    include ::ceilometer::agent::auth
-    class { '::ceilometer::agent::polling':
+    include ceilometer::agent::auth
+    class { 'ceilometer::agent::polling':
       central_namespace => $central_namespace,
       compute_namespace => $compute_namespace,
       ipmi_namespace    => $ipmi_namespace,
diff --git a/manifests/profile/base/ceilometer/expirer.pp b/manifests/profile/base/ceilometer/expirer.pp
index e2a03990d..fb38ac6d8 100644
--- a/manifests/profile/base/ceilometer/expirer.pp
+++ b/manifests/profile/base/ceilometer/expirer.pp
@@ -26,10 +26,10 @@
 class tripleo::profile::base::ceilometer::expirer (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::ceilometer
+  include tripleo::profile::base::ceilometer
 
   if $step >= 4 {
-    include ::ceilometer::expirer
+    include ceilometer::expirer
     Cron <| title == 'ceilometer-expirer' |>
       { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) \\% 86400)) && ${::ceilometer::params::expirer_command}" }
   }
diff --git a/manifests/profile/base/ceilometer/upgrade.pp b/manifests/profile/base/ceilometer/upgrade.pp
index 7d319aa12..685d8b293 100644
--- a/manifests/profile/base/ceilometer/upgrade.pp
+++ b/manifests/profile/base/ceilometer/upgrade.pp
@@ -54,7 +54,7 @@ class tripleo::profile::base::ceilometer::upgrade (
 
     # NOTE(sileht): Ensure we run before ceilometer-agent-notification is
     # started and after gnocchi-api is running
-    include ::gnocchi::deps
+    include gnocchi::deps
     Anchor['gnocchi::service::end']
     ~> Exec['ceilometer-db-upgrade']
     ~> Anchor['ceilometer::service::begin']
diff --git a/manifests/profile/base/certmonger_user.pp b/manifests/profile/base/certmonger_user.pp
index f8fa63887..4d14e2f23 100644
--- a/manifests/profile/base/certmonger_user.pp
+++ b/manifests/profile/base/certmonger_user.pp
@@ -199,13 +199,13 @@ class tripleo::profile::base::certmonger_user (
   $haproxy_postsave_cmd               = undef,
   $apache_postsave_cmd                = undef,
 ) {
-  include ::certmonger
+  include certmonger
 
   if $step == 1  {
     # This is only needed for certmonger's local CA. For any other CA this
     # operation (trusting the CA) should be done by the deployer.
     if $certmonger_ca == 'local' {
-        include ::tripleo::certmonger::ca::local
+        include tripleo::certmonger::ca::local
     }
     unless empty($haproxy_certificates_specs) {
       $reload_haproxy = ['systemctl reload haproxy']
@@ -216,38 +216,38 @@ class tripleo::profile::base::certmonger_user (
     } else {
       $reload_haproxy = []
     }
-    class { '::tripleo::certmonger::ca::crl' :
+    class { 'tripleo::certmonger::ca::crl' :
       reload_cmds => $reload_haproxy,
     }
     Certmonger_certificate<||> -> Class['::tripleo::certmonger::ca::crl']
-    include ::tripleo::certmonger::ca::libvirt_vnc
-    include ::tripleo::certmonger::ca::qemu
+    include tripleo::certmonger::ca::libvirt_vnc
+    include tripleo::certmonger::ca::qemu
 
     # Remove apache_certificates_specs where hostname is empty.
     # Workaround bug: https://bugs.launchpad.net/tripleo/+bug/1811207
     $apache_certificates_specs_filtered = $apache_certificates_specs.filter | $specs, $keys | { ! empty($keys[hostname]) }
     unless empty($apache_certificates_specs_filtered) {
-      include ::tripleo::certmonger::apache_dirs
+      include tripleo::certmonger::apache_dirs
       ensure_resources('tripleo::certmonger::httpd', $apache_certificates_specs_filtered)
     }
     unless empty($libvirt_certificates_specs) {
-      include ::tripleo::certmonger::libvirt_dirs
+      include tripleo::certmonger::libvirt_dirs
       ensure_resources('tripleo::certmonger::libvirt', $libvirt_certificates_specs,
                         {'postsave_cmd' => $libvirt_postsave_cmd})
     }
     unless empty($libvirt_vnc_certificates_specs) {
-      include ::tripleo::certmonger::libvirt_vnc_dirs
+      include tripleo::certmonger::libvirt_vnc_dirs
       ensure_resources('tripleo::certmonger::libvirt_vnc', $libvirt_vnc_certificates_specs,
                         {'postsave_cmd' => $libvirt_vnc_postsave_cmd})
     }
     unless empty($qemu_certificates_specs) {
-      include ::tripleo::certmonger::qemu_dirs
-      include ::tripleo::certmonger::qemu_nbd_dirs
+      include tripleo::certmonger::qemu_dirs
+      include tripleo::certmonger::qemu_nbd_dirs
       ensure_resources('tripleo::certmonger::qemu', $qemu_certificates_specs,
                         {'postsave_cmd' => $qemu_postsave_cmd})
     }
     unless empty($haproxy_certificates_specs) {
-      include ::tripleo::certmonger::haproxy_dirs
+      include tripleo::certmonger::haproxy_dirs
       ensure_resources('tripleo::certmonger::haproxy', $haproxy_certificates_specs)
       # The haproxy fronends (or listen resources) depend on the certificate
       # existing and need to be refreshed if it changed.
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index e6e598e09..9ba388fdd 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -104,7 +104,7 @@ class tripleo::profile::base::cinder (
   if $step >= 4 or ($step >= 3 and $sync_db) {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::cinder' :
+    class { 'cinder' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
@@ -114,7 +114,7 @@ class tripleo::profile::base::cinder (
         'ssl'       => $oslomsg_rpc_use_ssl_real,
       }),
     }
-    class { '::cinder::ceilometer' :
+    class { 'cinder::ceilometer' :
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
@@ -124,16 +124,16 @@ class tripleo::profile::base::cinder (
         'ssl'       => $oslomsg_notify_use_ssl_real,
       }),
     }
-    include ::cinder::config
-    include ::cinder::glance
-    include ::cinder::nova
-    include ::cinder::logging
-    include ::cinder::keystone::service_user
+    include cinder::config
+    include cinder::glance
+    include cinder::nova
+    include cinder::logging
+    include cinder::keystone::service_user
   }
 
   if $step >= 5 {
     if $cinder_enable_db_purge {
-      include ::cinder::cron::db_purge
+      include cinder::cron::db_purge
     }
   }
 
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index cd991f593..8f61cecdd 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -75,8 +75,8 @@ class tripleo::profile::base::cinder::api (
     $manage_type = false
   }
 
-  include ::tripleo::profile::base::cinder
-  include ::tripleo::profile::base::cinder::authtoken
+  include tripleo::profile::base::cinder
+  include tripleo::profile::base::cinder::authtoken
 
   if $enable_internal_tls {
     if !$cinder_api_network {
@@ -90,16 +90,16 @@ class tripleo::profile::base::cinder::api (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    class { '::cinder::api':
+    class { 'cinder::api':
       sync_db        => $sync_db,
       keymgr_backend => $keymgr_backend,
     }
-    include ::tripleo::profile::base::apache
-    class { '::cinder::wsgi::apache':
+    include tripleo::profile::base::apache
+    class { 'cinder::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
-    include ::cinder::ceilometer
+    include cinder::ceilometer
   }
 
   if $step == 4 and $manage_type and $default_volume_type != '' {
diff --git a/manifests/profile/base/cinder/authtoken.pp b/manifests/profile/base/cinder/authtoken.pp
index 2f1612c0c..71b2173e6 100644
--- a/manifests/profile/base/cinder/authtoken.pp
+++ b/manifests/profile/base/cinder/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::cinder::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::cinder::keystone::authtoken':
+    class { 'cinder::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/cinder/backup.pp b/manifests/profile/base/cinder/backup.pp
index ecf65ea7e..75a879bba 100644
--- a/manifests/profile/base/cinder/backup.pp
+++ b/manifests/profile/base/cinder/backup.pp
@@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup (
   $step = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::cinder
+  include tripleo::profile::base::cinder
 
   if $step >= 4 {
-    include ::cinder::backup
+    include cinder::backup
   }
 
 }
diff --git a/manifests/profile/base/cinder/backup/ceph.pp b/manifests/profile/base/cinder/backup/ceph.pp
index d6eb47ba0..73ffeb362 100644
--- a/manifests/profile/base/cinder/backup/ceph.pp
+++ b/manifests/profile/base/cinder/backup/ceph.pp
@@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup::ceph (
   $step = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::cinder::backup
+  include tripleo::profile::base::cinder::backup
 
   if $step >= 4 {
-    include ::cinder::backup::ceph
+    include cinder::backup::ceph
   }
 
 }
diff --git a/manifests/profile/base/cinder/backup/nfs.pp b/manifests/profile/base/cinder/backup/nfs.pp
index 81b9590b8..c0ac5df6a 100644
--- a/manifests/profile/base/cinder/backup/nfs.pp
+++ b/manifests/profile/base/cinder/backup/nfs.pp
@@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup::nfs (
   $step = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::cinder::backup
+  include tripleo::profile::base::cinder::backup
 
   if $step >= 4 {
-    include ::cinder::backup::nfs
+    include cinder::backup::nfs
   }
 
 }
diff --git a/manifests/profile/base/cinder/backup/swift.pp b/manifests/profile/base/cinder/backup/swift.pp
index 96c620a39..5ecb8def6 100644
--- a/manifests/profile/base/cinder/backup/swift.pp
+++ b/manifests/profile/base/cinder/backup/swift.pp
@@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup::swift (
   $step = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::cinder::backup
+  include tripleo::profile::base::cinder::backup
 
   if $step >= 4 {
-    include ::cinder::backup::swift
+    include cinder::backup::swift
   }
 
 }
diff --git a/manifests/profile/base/cinder/scheduler.pp b/manifests/profile/base/cinder/scheduler.pp
index 9fd172f46..89a67dbef 100644
--- a/manifests/profile/base/cinder/scheduler.pp
+++ b/manifests/profile/base/cinder/scheduler.pp
@@ -26,10 +26,10 @@
 class tripleo::profile::base::cinder::scheduler (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder
+  include tripleo::profile::base::cinder
 
   if $step >= 4 {
-    include ::cinder::scheduler
+    include cinder::scheduler
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp
index 9a7cb2cd2..306d581bb 100644
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@ -136,7 +136,7 @@ class tripleo::profile::base::cinder::volume (
   $etcd_port                                   = hiera('tripleo::profile::base::etcd::client_port', '2379'),
   $step                                        = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder
+  include tripleo::profile::base::cinder
 
   if $step >= 4 {
     if $cinder_volume_cluster == '' {
@@ -158,38 +158,38 @@ class tripleo::profile::base::cinder::volume (
         $protocol = 'http'
       }
       $backend_url = sprintf('etcd3+%s://%s:%s', $protocol, $etcd_host, $etcd_port)
-      class { '::cinder::coordination' :
+      class { 'cinder::coordination' :
         backend_url => $backend_url,
       }
     }
 
-    class { '::cinder::volume' :
+    class { 'cinder::volume' :
       cluster => $cinder_volume_cluster_real,
     }
 
     if $cinder_enable_pure_backend {
-      include ::tripleo::profile::base::cinder::volume::pure
+      include tripleo::profile::base::cinder::volume::pure
       $cinder_pure_backend_name = hiera('cinder::backend::pure::volume_backend_name', 'tripleo_pure')
     } else {
       $cinder_pure_backend_name = undef
     }
 
     if $cinder_enable_dellsc_backend {
-      include ::tripleo::profile::base::cinder::volume::dellsc
+      include tripleo::profile::base::cinder::volume::dellsc
       $cinder_dellsc_backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc')
     } else {
       $cinder_dellsc_backend_name = undef
     }
 
     if $cinder_enable_dellemc_unity_backend {
-      include ::tripleo::profile::base::cinder::volume::dellemc_unity
+      include tripleo::profile::base::cinder::volume::dellemc_unity
       $cinder_dellemc_unity_backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity')
     } else {
       $cinder_dellemc_unity_backend_name = undef
     }
 
     if $cinder_enable_dellemc_vmax_iscsi_backend {
-      include ::tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi
+      include tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi
       $cinder_dellemc_vmax_iscsi_backend_name = hiera('cinder::backend::dellemc_vmax_iscsi::volume_backend_name',
           'tripleo_dellemc_vmax_iscsi')
     } else {
@@ -197,7 +197,7 @@ class tripleo::profile::base::cinder::volume (
     }
 
     if $cinder_enable_dellemc_vnx_backend {
-      include ::tripleo::profile::base::cinder::volume::dellemc_vnx
+      include tripleo::profile::base::cinder::volume::dellemc_vnx
       $cinder_dellemc_vnx_backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name',
           'tripleo_dellemc_vnx')
     } else {
@@ -205,7 +205,7 @@ class tripleo::profile::base::cinder::volume (
     }
 
     if $cinder_enable_dellemc_xtremio_iscsi_backend {
-      include ::tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi
+      include tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi
       $cinder_dellemc_xtreamio_iscsi_backend_name = hiera('cinder::backend::dellemc_extremio_iscsi::volume_backend_name',
           'tripleo_dellemc_xtremio_iscsi')
     } else {
@@ -213,42 +213,42 @@ class tripleo::profile::base::cinder::volume (
     }
 
     if $cinder_enable_hpelefthand_backend {
-      include ::tripleo::profile::base::cinder::volume::hpelefthand
+      include tripleo::profile::base::cinder::volume::hpelefthand
       $cinder_hpelefthand_backend_name = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand')
     } else {
       $cinder_hpelefthand_backend_name = undef
     }
 
     if $cinder_enable_dellps_backend {
-      include ::tripleo::profile::base::cinder::volume::dellps
+      include tripleo::profile::base::cinder::volume::dellps
       $cinder_dellps_backend_name = hiera('cinder::backend::dellps::volume_backend_name', 'tripleo_dellps')
     } else {
       $cinder_dellps_backend_name = undef
     }
 
     if $cinder_enable_iscsi_backend {
-      include ::tripleo::profile::base::cinder::volume::iscsi
+      include tripleo::profile::base::cinder::volume::iscsi
       $cinder_iscsi_backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi')
     } else {
       $cinder_iscsi_backend_name = undef
     }
 
     if $cinder_enable_netapp_backend {
-      include ::tripleo::profile::base::cinder::volume::netapp
+      include tripleo::profile::base::cinder::volume::netapp
       $cinder_netapp_backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp')
     } else {
       $cinder_netapp_backend_name = undef
     }
 
     if $cinder_enable_nfs_backend {
-      include ::tripleo::profile::base::cinder::volume::nfs
+      include tripleo::profile::base::cinder::volume::nfs
       $cinder_nfs_backend_name = hiera('cinder::backend::nfs::volume_backend_name', 'tripleo_nfs')
     } else {
       $cinder_nfs_backend_name = undef
     }
 
     if $cinder_enable_rbd_backend {
-      include ::tripleo::profile::base::cinder::volume::rbd
+      include tripleo::profile::base::cinder::volume::rbd
       $cinder_rbd_backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph')
 
       exec{ "exec-setfacl-${cinder_rbd_client_name}-cinder":
@@ -275,21 +275,21 @@ class tripleo::profile::base::cinder::volume (
     }
 
     if $cinder_enable_scaleio_backend {
-      include ::tripleo::profile::base::cinder::volume::scaleio
+      include tripleo::profile::base::cinder::volume::scaleio
       $cinder_scaleio_backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio')
     } else {
       $cinder_scaleio_backend_name = undef
     }
 
     if $cinder_enable_vrts_hs_backend {
-      include ::tripleo::profile::base::cinder::volume::veritas_hyperscale
+      include tripleo::profile::base::cinder::volume::veritas_hyperscale
       $cinder_veritas_hyperscale_backend_name = 'Veritas_HyperScale'
     } else {
       $cinder_veritas_hyperscale_backend_name = undef
     }
 
     if $cinder_enable_nvmeof_backend {
-      include ::tripleo::profile::base::cinder::volume::nvmeof
+      include tripleo::profile::base::cinder::volume::nvmeof
       $cinder_nvmeof_backend_name = hiera('cinder::backend::nvmeof::volume_backend_name', 'tripleo_nvmeof')
     } else {
       $cinder_nvmeof_backend_name = undef
@@ -318,7 +318,7 @@ class tripleo::profile::base::cinder::volume (
     # "" strings in our array.
     $cinder_enabled_backends = delete($backends, '')
 
-    class { '::cinder::backends' :
+    class { 'cinder::backends' :
       enabled_backends => $cinder_enabled_backends,
     }
   }
diff --git a/manifests/profile/base/cinder/volume/dellemc_unity.pp b/manifests/profile/base/cinder/volume/dellemc_unity.pp
index f1cddbc1f..02194d47e 100644
--- a/manifests/profile/base/cinder/volume/dellemc_unity.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_unity.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_unity (
   $backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::dellemc_unity { $backend_name :
diff --git a/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp b/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp
index b412ff824..0d2f1ffa7 100644
--- a/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi (
   $backend_name = hiera('cinder::backend::dellemc_vmax_iscsi::volume_backend_name', 'tripleo_dellemc_vmax_iscsi'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::dellemc_vmax_iscsi { $backend_name :
diff --git a/manifests/profile/base/cinder/volume/dellemc_vnx.pp b/manifests/profile/base/cinder/volume/dellemc_vnx.pp
index 85fc9acee..ba8465142 100644
--- a/manifests/profile/base/cinder/volume/dellemc_vnx.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_vnx.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_vnx (
   $backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name', 'tripleo_dellemc_vnx'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     # Accept recently deprecated 'storage_vnx_pool_name'
diff --git a/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp b/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp
index 0221517fe..e456c190d 100644
--- a/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi (
   $backend_name = hiera('cinder::backend::dellemc_xtremio_iscsi::volume_backend_name', 'tripleo_dellemc_xtremio_iscsi'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::dellemc_xtremio_iscsi { $backend_name :
diff --git a/manifests/profile/base/cinder/volume/dellps.pp b/manifests/profile/base/cinder/volume/dellps.pp
index dda9a1966..e6180d9e6 100644
--- a/manifests/profile/base/cinder/volume/dellps.pp
+++ b/manifests/profile/base/cinder/volume/dellps.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellps (
   $backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::eqlx { $backend_name :
diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index a47481c80..e034102f8 100644
--- a/manifests/profile/base/cinder/volume/dellsc.pp
+++ b/manifests/profile/base/cinder/volume/dellsc.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellsc (
   $backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
 
diff --git a/manifests/profile/base/cinder/volume/hpelefthand.pp b/manifests/profile/base/cinder/volume/hpelefthand.pp
index ffa5612ee..3f851e532 100644
--- a/manifests/profile/base/cinder/volume/hpelefthand.pp
+++ b/manifests/profile/base/cinder/volume/hpelefthand.pp
@@ -60,7 +60,7 @@ class tripleo::profile::base::cinder::volume::hpelefthand (
   $cinder_hpelefthand_debug              = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_debug', undef),
   $step                                  = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::hpelefthand_iscsi { $backend_name :
diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index da4454ea8..1e17dc0de 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -55,10 +55,10 @@ class tripleo::profile::base::cinder::volume::iscsi (
   $cinder_lvm_loop_device_size = '10280',
   $step                        = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
-    class { '::cinder::setup_test_volume':
+    class { 'cinder::setup_test_volume':
       size => join([$cinder_lvm_loop_device_size, 'M']),
     }
 
diff --git a/manifests/profile/base/cinder/volume/netapp.pp b/manifests/profile/base/cinder/volume/netapp.pp
index 589543995..f9405b975 100644
--- a/manifests/profile/base/cinder/volume/netapp.pp
+++ b/manifests/profile/base/cinder/volume/netapp.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::netapp (
   $backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     if hiera('cinder::backend::netapp::nfs_shares', undef) {
diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp
index 392e4e579..7366e5fcb 100644
--- a/manifests/profile/base/cinder/volume/nfs.pp
+++ b/manifests/profile/base/cinder/volume/nfs.pp
@@ -69,7 +69,7 @@ class tripleo::profile::base::cinder::volume::nfs (
   $cinder_nas_secure_file_permissions = $::os_service_default,
   $step                               = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     package {'nfs-utils': }
diff --git a/manifests/profile/base/cinder/volume/nvmeof.pp b/manifests/profile/base/cinder/volume/nvmeof.pp
index c1d772c19..8ebd9b465 100644
--- a/manifests/profile/base/cinder/volume/nvmeof.pp
+++ b/manifests/profile/base/cinder/volume/nvmeof.pp
@@ -59,7 +59,7 @@ class tripleo::profile::base::cinder::volume::nvmeof (
   $volume_driver             = 'cinder.volume.drivers.lvm.LVMVolumeDriver',
   $step                      = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::nvmeof { $volume_backend_name :
diff --git a/manifests/profile/base/cinder/volume/pure.pp b/manifests/profile/base/cinder/volume/pure.pp
index 3b23f13c5..6ba347668 100644
--- a/manifests/profile/base/cinder/volume/pure.pp
+++ b/manifests/profile/base/cinder/volume/pure.pp
@@ -36,7 +36,7 @@ class tripleo::profile::base::cinder::volume::pure (
   $multi_config = hiera('cinder::backend::pure::volume_multi_config', {}),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     $backend_defaults = {
diff --git a/manifests/profile/base/cinder/volume/rbd.pp b/manifests/profile/base/cinder/volume/rbd.pp
index fdd13133c..0db22a886 100644
--- a/manifests/profile/base/cinder/volume/rbd.pp
+++ b/manifests/profile/base/cinder/volume/rbd.pp
@@ -75,7 +75,7 @@ class tripleo::profile::base::cinder::volume::rbd (
   $cinder_rbd_flatten_volume_from_snapshot = hiera('cinder::backend::rbd::flatten_volume_from_snapshot', undef),
   $step                                    = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::rbd { $backend_name :
diff --git a/manifests/profile/base/cinder/volume/scaleio.pp b/manifests/profile/base/cinder/volume/scaleio.pp
index b0da7e4a9..0c0b521f5 100644
--- a/manifests/profile/base/cinder/volume/scaleio.pp
+++ b/manifests/profile/base/cinder/volume/scaleio.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::scaleio (
   $backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio'),
   $step         = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::scaleio { $backend_name :
diff --git a/manifests/profile/base/cinder/volume/veritas_hyperscale.pp b/manifests/profile/base/cinder/volume/veritas_hyperscale.pp
index 39f2d7cb1..a0222b616 100644
--- a/manifests/profile/base/cinder/volume/veritas_hyperscale.pp
+++ b/manifests/profile/base/cinder/volume/veritas_hyperscale.pp
@@ -34,7 +34,7 @@ class tripleo::profile::base::cinder::volume::veritas_hyperscale (
   $backend_name = hiera('cinder::backend::veritas_hyperscale::volume_backend_name', 'Veritas_HyperScale'),
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
     cinder::backend::veritas_hyperscale { $backend_name :
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 79c872fba..04efc52c3 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -177,7 +177,7 @@ class tripleo::profile::base::database::mysql (
       }
     }
     $mysql_server_options_real = deep_merge($mysql_server_default, $mysql_server_options)
-    class { '::mysql::server':
+    class { 'mysql::server':
       config_file             => $mysql_config_file,
       override_options        => $mysql_server_options_real,
       create_root_user        => $manage_resources,
@@ -206,77 +206,77 @@ class tripleo::profile::base::database::mysql (
   if $step >= 2 and $sync_db {
     Class['::mysql::server'] -> Mysql_database<||>
     if hiera('aodh_api_enabled', false) {
-      include ::aodh::db::mysql
+      include aodh::db::mysql
     }
     if hiera('ceilometer_collector_enabled', false) {
-      include ::ceilometer::db::mysql
+      include ceilometer::db::mysql
     }
     if hiera('cinder_api_enabled', false) {
-      include ::cinder::db::mysql
+      include cinder::db::mysql
     }
     if hiera('barbican_api_enabled', false) {
-      include ::barbican::db::mysql
+      include barbican::db::mysql
     }
     if hiera('designate_api_enabled', false) {
-      include ::designate::db::mysql
+      include designate::db::mysql
     }
     if hiera('glance_api_enabled', false) {
-      include ::glance::db::mysql
+      include glance::db::mysql
     }
     if hiera('gnocchi_api_enabled', false) {
-      include ::gnocchi::db::mysql
+      include gnocchi::db::mysql
     }
     if hiera('heat_engine_enabled', false) {
-      include ::heat::db::mysql
+      include heat::db::mysql
     }
     if hiera('ironic_api_enabled', false) {
-      include ::ironic::db::mysql
+      include ironic::db::mysql
     }
     if hiera('ironic_inspector_enabled', false) {
-      include ::ironic::inspector::db::mysql
+      include ironic::inspector::db::mysql
     }
     if hiera('keystone_enabled', false) {
-      include ::keystone::db::mysql
+      include keystone::db::mysql
     }
     if hiera('manila_api_enabled', false) {
-      include ::manila::db::mysql
+      include manila::db::mysql
     }
     if hiera('mistral_api_enabled', false) {
-      include ::mistral::db::mysql
+      include mistral::db::mysql
     }
     if hiera('neutron_api_enabled', false) {
-      include ::neutron::db::mysql
+      include neutron::db::mysql
     }
     if hiera('nova_conductor_enabled', false) {
-      include ::nova::db::mysql
+      include nova::db::mysql
     }
     if hiera('nova_api_enabled', false) {
-      include ::nova::db::mysql_api
+      include nova::db::mysql_api
     }
     if hiera('placement_enabled', false) {
-      include ::placement::db::mysql
+      include placement::db::mysql
     }
     if hiera('octavia_api_enabled', false) {
-      include ::octavia::db::mysql
+      include octavia::db::mysql
     }
     if hiera('sahara_api_enabled', false) {
-      include ::sahara::db::mysql
+      include sahara::db::mysql
     }
     if hiera('trove_api_enabled', false) {
-      include ::trove::db::mysql
+      include trove::db::mysql
     }
     if hiera('panko_api_enabled', false) {
-      include ::panko::db::mysql
+      include panko::db::mysql
     }
     if hiera('ec2_api_enabled', false) {
-      include ::ec2api::db::mysql
+      include ec2api::db::mysql
     }
     if hiera('zaqar_api_enabled', false) and hiera('zaqar::db::mysql::user', '') == 'zaqar' {
       # NOTE: by default zaqar uses sqlalchemy
-      include ::zaqar::db::mysql
+      include zaqar::db::mysql
     }
     if hiera('veritas_hyperscale_controller_enabled', false) {
-      include ::veritas_hyperscale::db::mysql
+      include veritas_hyperscale::db::mysql
     }
   }
 
diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp
index 4fde0f9cf..41a2a777c 100644
--- a/manifests/profile/base/database/redis.pp
+++ b/manifests/profile/base/database/redis.pp
@@ -91,7 +91,7 @@ class tripleo::profile::base::database::redis (
       $tls_certfile = $certificate_specs['service_certificate']
       $tls_keyfile = $certificate_specs['service_key']
 
-      include ::tripleo::stunnel
+      include tripleo::stunnel
 
       ::tripleo::stunnel::service_proxy { 'redis':
         accept_host  => $tls_proxy_bind_ip,
@@ -107,14 +107,14 @@ class tripleo::profile::base::database::redis (
     } else {
       $slaveof = "${redis_short_bootstrap_node_name} 6379"
     }
-    class { '::redis' :
+    class { 'redis' :
       slaveof => $slaveof,
     }
 
     if count($redis_node_ips) > 1 {
       Class['::tripleo::redis_notification'] -> Service['redis-sentinel']
-      include ::redis::sentinel
-      include ::tripleo::redis_notification
+      include redis::sentinel
+      include tripleo::redis_notification
     }
   }
 }
diff --git a/manifests/profile/base/designate.pp b/manifests/profile/base/designate.pp
index 84d3a2675..f012ef76a 100644
--- a/manifests/profile/base/designate.pp
+++ b/manifests/profile/base/designate.pp
@@ -108,7 +108,7 @@ class tripleo::profile::base::designate (
   if $step >= 3 {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::designate' :
+    class { 'designate' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
@@ -127,7 +127,7 @@ class tripleo::profile::base::designate (
       }),
     }
     if ($rndc_host and $rndc_allowed_addresses) {
-      class { '::designate::backend::bind9':
+      class { 'designate::backend::bind9':
         rndc_controls => {
           $rndc_host => {
             'port'              => $rndc_port,
@@ -137,9 +137,9 @@ class tripleo::profile::base::designate (
         },
       }
     } else {
-      include ::designate::backend::bind9
+      include designate::backend::bind9
     }
-    include ::designate::config
-    include ::designate::logging
+    include designate::config
+    include designate::logging
   }
 }
diff --git a/manifests/profile/base/designate/api.pp b/manifests/profile/base/designate/api.pp
index c3edb0e55..703064611 100644
--- a/manifests/profile/base/designate/api.pp
+++ b/manifests/profile/base/designate/api.pp
@@ -37,12 +37,12 @@ class tripleo::profile::base::designate::api (
   $listen_port    = '9001',
 ) {
 
-  include ::tripleo::profile::base::designate
+  include tripleo::profile::base::designate
 
   if ($step >= 3) {
     $listen_uri = normalize_ip_for_uri($listen_ip)
-    include ::designate::keystone::authtoken
-    class { '::designate::api':
+    include designate::keystone::authtoken
+    class { 'designate::api':
       listen => "${listen_uri}:${listen_port}",
     }
   }
diff --git a/manifests/profile/base/designate/central.pp b/manifests/profile/base/designate/central.pp
index fab4736d9..9e5dc54db 100644
--- a/manifests/profile/base/designate/central.pp
+++ b/manifests/profile/base/designate/central.pp
@@ -51,13 +51,13 @@ class tripleo::profile::base::designate::central (
     path    => '/etc/designate/pools.yaml',
     content => $pools_file_content_real,
   }
-  include ::tripleo::profile::base::designate
+  include tripleo::profile::base::designate
   if ($step >= 4 or ($step >= 3 and $sync_db)) {
-    class { '::designate::db':
+    class { 'designate::db':
       sync_db => $sync_db,
     }
-    include ::designate::central
-    include ::designate::quota
+    include designate::central
+    include designate::quota
   }
   if ($step == 5 and $sync_db) {
     exec { 'pool update':
diff --git a/manifests/profile/base/designate/mdns.pp b/manifests/profile/base/designate/mdns.pp
index afc30ed59..41b89ca06 100644
--- a/manifests/profile/base/designate/mdns.pp
+++ b/manifests/profile/base/designate/mdns.pp
@@ -26,8 +26,8 @@
 class tripleo::profile::base::designate::mdns (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::designate
+  include tripleo::profile::base::designate
   if $step >= 4 {
-    include ::designate::mdns
+    include designate::mdns
   }
 }
diff --git a/manifests/profile/base/designate/producer.pp b/manifests/profile/base/designate/producer.pp
index 7beb212d8..fb94c4b77 100644
--- a/manifests/profile/base/designate/producer.pp
+++ b/manifests/profile/base/designate/producer.pp
@@ -26,8 +26,8 @@
 class tripleo::profile::base::designate::producer (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::designate
+  include tripleo::profile::base::designate
   if $step >= 4 {
-    include ::designate::producer
+    include designate::producer
   }
 }
diff --git a/manifests/profile/base/designate/sink.pp b/manifests/profile/base/designate/sink.pp
index a69a308bf..cabe06acf 100644
--- a/manifests/profile/base/designate/sink.pp
+++ b/manifests/profile/base/designate/sink.pp
@@ -26,8 +26,8 @@
 class tripleo::profile::base::designate::sink (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::designate
+  include tripleo::profile::base::designate
   if $step >= 4 {
-    include ::designate::sink
+    include designate::sink
   }
 }
diff --git a/manifests/profile/base/designate/worker.pp b/manifests/profile/base/designate/worker.pp
index c31745937..b1b7715e1 100644
--- a/manifests/profile/base/designate/worker.pp
+++ b/manifests/profile/base/designate/worker.pp
@@ -31,7 +31,7 @@ class tripleo::profile::base::designate::worker (
   $step = Integer(hiera('step')),
   $rndc_key = hiera('designate_rndc_key', false),
 ) {
-  include ::tripleo::profile::base::designate
+  include tripleo::profile::base::designate
 
   if $step >= 4 {
     if $rndc_key {
@@ -40,6 +40,6 @@ class tripleo::profile::base::designate::worker (
         content => template('tripleo/designate/rndc.key.erb')
       }
     }
-    include ::designate::worker
+    include designate::worker
   }
 }
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index c1e05bd37..e8b71ba8c 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -148,7 +148,7 @@ class tripleo::profile::base::glance::api (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::glance::authtoken
+  include tripleo::profile::base::glance::authtoken
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
     if $enable_internal_tls {
@@ -172,7 +172,7 @@ class tripleo::profile::base::glance::api (
         tls_key    => $tls_keyfile,
         notify     => Class['::glance::api'],
       }
-      include ::tripleo::profile::base::apache
+      include tripleo::profile::base::apache
     }
     case $glance_backend {
         'swift': { $backend_store = 'swift' }
@@ -196,16 +196,16 @@ class tripleo::profile::base::glance::api (
     $http_store = ['http']
     $glance_store = concat($http_store, $backend_store)
 
-    include ::glance
-    include ::glance::config
-    include ::glance::api::logging
-    class { '::glance::api':
+    include glance
+    include glance::config
+    include glance::api::logging
+    class { 'glance::api':
       stores  => $glance_store,
       sync_db => $sync_db,
     }
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::glance::notify::rabbitmq' :
+    class { 'glance::notify::rabbitmq' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
diff --git a/manifests/profile/base/glance/authtoken.pp b/manifests/profile/base/glance/authtoken.pp
index 46c3add97..bd2dba3a5 100644
--- a/manifests/profile/base/glance/authtoken.pp
+++ b/manifests/profile/base/glance/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::glance::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::glance::api::authtoken':
+    class { 'glance::api::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/gnocchi.pp b/manifests/profile/base/gnocchi.pp
index 148e1d465..6650d342b 100644
--- a/manifests/profile/base/gnocchi.pp
+++ b/manifests/profile/base/gnocchi.pp
@@ -29,10 +29,10 @@ class tripleo::profile::base::gnocchi (
   if $step >= 3 {
     warning('Gnocchi is deprecated and is going to be removed in future.')
 
-    include ::gnocchi
-    include ::gnocchi::config
-    include ::gnocchi::cors
-    include ::gnocchi::client
-    include ::gnocchi::logging
+    include gnocchi
+    include gnocchi::config
+    include gnocchi::cors
+    include gnocchi::client
+    include gnocchi::logging
   }
 }
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 32bfd65d6..890055f53 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -86,8 +86,8 @@ class tripleo::profile::base::gnocchi::api (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::gnocchi
-  include ::tripleo::profile::base::gnocchi::authtoken
+  include tripleo::profile::base::gnocchi
+  include tripleo::profile::base::gnocchi::authtoken
 
   if $enable_internal_tls {
     if !$gnocchi_network {
@@ -112,41 +112,41 @@ class tripleo::profile::base::gnocchi::api (
         $db_sync_extra_opts = undef
       }
 
-      class { '::gnocchi::db::sync':
+      class { 'gnocchi::db::sync':
         extra_opts => $db_sync_extra_opts,
       }
     }
 
-    include ::gnocchi::api
-    include ::tripleo::profile::base::apache
-    class { '::gnocchi::wsgi::apache':
+    include gnocchi::api
+    include tripleo::profile::base::apache
+    class { 'gnocchi::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
 
-    class { '::gnocchi::storage':
+    class { 'gnocchi::storage':
       coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]),
     }
 
     if $incoming_storage_driver == 'redis' {
-      class { '::gnocchi::storage::incoming::redis':
+      class { 'gnocchi::storage::incoming::redis':
         redis_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]),
       }
     }
 
     case $gnocchi_backend {
       'swift': {
-        include ::gnocchi::storage::swift
+        include gnocchi::storage::swift
         if $sync_db {
-          include ::swift::deps
+          include swift::deps
           # Ensure we have swift proxy available before running gnocchi-upgrade
           # as storage is initialized at this point.
           Anchor<| title == 'swift::service::end' |> ~> Anchor['gnocchi::dbsync::begin']
         }
       }
-      'file': { include ::gnocchi::storage::file }
+      'file': { include gnocchi::storage::file }
       'rbd': {
-        include ::gnocchi::storage::ceph
+        include gnocchi::storage::ceph
         exec{ "exec-setfacl-${gnocchi_rbd_client_name}-gnocchi":
           path    => ['/bin', '/usr/bin'],
           command => "setfacl -m u:gnocchi:r-- /etc/ceph/ceph.client.${gnocchi_rbd_client_name}.keyring",
@@ -158,7 +158,7 @@ class tripleo::profile::base::gnocchi::api (
           unless  => "getfacl /etc/ceph/ceph.client.${gnocchi_rbd_client_name}.keyring | grep -q mask::r",
         }
       }
-      's3': { include ::gnocchi::storage::s3 }
+      's3': { include gnocchi::storage::s3 }
       default: { fail('Unrecognized gnocchi_backend parameter.') }
     }
   }
diff --git a/manifests/profile/base/gnocchi/authtoken.pp b/manifests/profile/base/gnocchi/authtoken.pp
index d5219e82e..407600834 100644
--- a/manifests/profile/base/gnocchi/authtoken.pp
+++ b/manifests/profile/base/gnocchi/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::gnocchi::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::gnocchi::keystone::authtoken':
+    class { 'gnocchi::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp
index c585e57c6..0a6386238 100644
--- a/manifests/profile/base/gnocchi/metricd.pp
+++ b/manifests/profile/base/gnocchi/metricd.pp
@@ -26,9 +26,9 @@
 class tripleo::profile::base::gnocchi::metricd (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::gnocchi
+  include tripleo::profile::base::gnocchi
 
   if $step >= 5 {
-    include ::gnocchi::metricd
+    include gnocchi::metricd
   }
 }
diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp
index 184ff7b3b..26a3a39b5 100644
--- a/manifests/profile/base/gnocchi/statsd.pp
+++ b/manifests/profile/base/gnocchi/statsd.pp
@@ -26,9 +26,9 @@
 class tripleo::profile::base::gnocchi::statsd (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::gnocchi
+  include tripleo::profile::base::gnocchi
 
   if $step >= 5 {
-    include ::gnocchi::statsd
+    include gnocchi::statsd
   }
 }
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index ab9fae0bd..84ecd989a 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -97,12 +97,12 @@ class tripleo::profile::base::heat (
   $oslomsg_notify_use_ssl  = hiera('oslo_messaging_notify_use_ssl', '0'),
 ) {
 
-  include ::tripleo::profile::base::heat::authtoken
+  include tripleo::profile::base::heat::authtoken
 
   # Domain resources will be created at step5 on the node running keystone.pp
   # configure heat.conf at step3 and 4 but actually create the domain later.
   if $step >= 3 {
-    class { '::heat::keystone::domain':
+    class { 'heat::keystone::domain':
       manage_domain => false,
       manage_user   => false,
       manage_role   => false,
@@ -110,7 +110,7 @@ class tripleo::profile::base::heat (
 
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::heat' :
+    class { 'heat' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
@@ -128,14 +128,14 @@ class tripleo::profile::base::heat (
         'ssl'       => $oslomsg_notify_use_ssl_real,
       }),
     }
-    include ::heat::config
-    include ::heat::cors
-    include ::heat::logging
+    include heat::config
+    include heat::cors
+    include heat::logging
   }
 
   if $step >= 5 {
     if $manage_db_purge {
-      include ::heat::cron::purge_deleted
+      include heat::cron::purge_deleted
     }
   }
 }
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index 3984c49ed..0a4ca715a 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -61,7 +61,7 @@ class tripleo::profile::base::heat::api (
     $is_bootstrap = false
   }
 
-  include ::tripleo::profile::base::heat
+  include tripleo::profile::base::heat
 
   if $enable_internal_tls {
     if !$heat_api_network {
@@ -75,9 +75,9 @@ class tripleo::profile::base::heat::api (
   }
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::heat::api
-    include ::tripleo::profile::base::apache
-    class { '::heat::wsgi::apache_api':
+    include heat::api
+    include tripleo::profile::base::apache
+    class { 'heat::wsgi::apache_api':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index ce6330206..5e209fa95 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -61,7 +61,7 @@ class tripleo::profile::base::heat::api_cfn (
     $is_bootstrap = false
   }
 
-  include ::tripleo::profile::base::heat
+  include tripleo::profile::base::heat
 
   if $enable_internal_tls {
     if !$heat_api_cfn_network {
@@ -75,10 +75,10 @@ class tripleo::profile::base::heat::api_cfn (
   }
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::heat::api_cfn
+    include heat::api_cfn
 
-    include ::tripleo::profile::base::apache
-    class { '::heat::wsgi::apache_api_cfn':
+    include tripleo::profile::base::apache
+    class { 'heat::wsgi::apache_api_cfn':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/heat/authtoken.pp b/manifests/profile/base/heat/authtoken.pp
index 5acf39c68..218be95a0 100644
--- a/manifests/profile/base/heat/authtoken.pp
+++ b/manifests/profile/base/heat/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::heat::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::heat::keystone::authtoken':
+    class { 'heat::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp
index ac33ed6f6..6ff84c0b1 100644
--- a/manifests/profile/base/heat/engine.pp
+++ b/manifests/profile/base/heat/engine.pp
@@ -37,10 +37,10 @@ class tripleo::profile::base::heat::engine (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::heat
+  include tripleo::profile::base::heat
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::heat::engine
+    include heat::engine
   }
 
 }
diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index 838ff8cea..b71e28087 100644
--- a/manifests/profile/base/horizon.pp
+++ b/manifests/profile/base/horizon.pp
@@ -84,8 +84,8 @@ class tripleo::profile::base::horizon (
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
     # Horizon
-    include ::tripleo::profile::base::apache
-    include ::apache::mod::remoteip
+    include tripleo::profile::base::apache
+    include apache::mod::remoteip
 
     if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers', undef) {
       $_profile_support = 'cisco'
@@ -101,7 +101,7 @@ class tripleo::profile::base::horizon (
         $horizon_memcached_servers = any2array(normalize_ip_for_uri($memcached_ips))
     }
 
-    class { '::horizon':
+    class { 'horizon':
       cache_server_ip => $horizon_memcached_servers,
       neutron_options => $neutron_options_real,
       horizon_cert    => $tls_certfile,
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index f4ea7bc60..8ef602b43 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -69,7 +69,7 @@ class tripleo::profile::base::ironic (
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
-    class { '::ironic':
+    class { 'ironic':
       sync_db                   => $sync_db,
       db_online_data_migrations => $sync_db,
       default_transport_url     => os_transport_url({
@@ -82,8 +82,8 @@ class tripleo::profile::base::ironic (
       }),
     }
 
-    include ::ironic::config
-    include ::ironic::cors
-    include ::ironic::logging
+    include ironic::config
+    include ironic::cors
+    include ironic::logging
   }
 }
diff --git a/manifests/profile/base/ironic/api.pp b/manifests/profile/base/ironic/api.pp
index aa48bf914..836906241 100644
--- a/manifests/profile/base/ironic/api.pp
+++ b/manifests/profile/base/ironic/api.pp
@@ -54,8 +54,8 @@ class tripleo::profile::base::ironic::api (
   $enable_internal_tls = hiera('enable_internal_tls', false),
   $step                = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::ironic
-  include ::tripleo::profile::base::ironic::authtoken
+  include tripleo::profile::base::ironic
+  include tripleo::profile::base::ironic::authtoken
 
   if $::hostname == downcase($bootstrap_node) {
     $is_bootstrap = true
@@ -75,10 +75,10 @@ class tripleo::profile::base::ironic::api (
   }
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::ironic::api
-    include ::ironic::cors
-    include ::tripleo::profile::base::apache
-    class { '::ironic::wsgi::apache':
+    include ironic::api
+    include ironic::cors
+    include tripleo::profile::base::apache
+    class { 'ironic::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/ironic/authtoken.pp b/manifests/profile/base/ironic/authtoken.pp
index fe743244a..f016f2545 100644
--- a/manifests/profile/base/ironic/authtoken.pp
+++ b/manifests/profile/base/ironic/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::ironic::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::ironic::api::authtoken':
+    class { 'ironic::api::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index 321886390..8326a2852 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -40,7 +40,7 @@ class tripleo::profile::base::ironic::conductor (
   $manage_pxe     = true,
   $enable_staging = false,
 ) {
-  include ::tripleo::profile::base::ironic
+  include tripleo::profile::base::ironic
   # Database is accessed by both API and conductor, hence it's here.
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -50,33 +50,33 @@ class tripleo::profile::base::ironic::conductor (
 
   # Ironic conductor class expects PXE directories exist
   if ($step >= 3 and $sync_db) and $manage_pxe {
-      include ::ironic::pxe
+      include ironic::pxe
   }
 
   if $step >= 4 {
-      include ::ironic::conductor
-      include ::ironic::drivers::interfaces
-      include ::ironic::drivers::pxe
+      include ironic::conductor
+      include ironic::drivers::interfaces
+      include ironic::drivers::pxe
       if $manage_pxe {
-          include ::ironic::pxe
+          include ironic::pxe
       }
 
       # Configure a few popular drivers
-      include ::ironic::drivers::ansible
-      include ::ironic::drivers::drac
-      include ::ironic::drivers::ilo
-      include ::ironic::drivers::ipmi
-      include ::ironic::drivers::redfish
+      include ironic::drivers::ansible
+      include ironic::drivers::drac
+      include ironic::drivers::ilo
+      include ironic::drivers::ipmi
+      include ironic::drivers::redfish
       if $enable_staging {
-          include ::ironic::drivers::staging
+          include ironic::drivers::staging
       }
 
       # Configure access to other services
-      include ::ironic::cinder
-      include ::ironic::drivers::inspector
-      include ::ironic::glance
-      include ::ironic::neutron
-      include ::ironic::service_catalog
-      include ::ironic::swift
+      include ironic::cinder
+      include ironic::drivers::inspector
+      include ironic::glance
+      include ironic::neutron
+      include ironic::service_catalog
+      include ironic::swift
   }
 }
diff --git a/manifests/profile/base/ironic_inspector.pp b/manifests/profile/base/ironic_inspector.pp
index af5724d3c..58967b1fe 100644
--- a/manifests/profile/base/ironic_inspector.pp
+++ b/manifests/profile/base/ironic_inspector.pp
@@ -59,7 +59,7 @@ class tripleo::profile::base::ironic_inspector (
   $step               = Integer(hiera('step')),
 ) {
 
-  include ::tripleo::profile::base::ironic_inspector::authtoken
+  include tripleo::profile::base::ironic_inspector::authtoken
 
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -74,15 +74,15 @@ class tripleo::profile::base::ironic_inspector (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::ironic::inspector::cors
-    class { '::ironic::inspector':
+    include ironic::inspector::cors
+    class { 'ironic::inspector':
       sync_db            => $sync_db,
       dnsmasq_ip_subnets => $inspection_subnets_real,
     }
 
-    include ::ironic::inspector::pxe_filter
-    include ::ironic::inspector::pxe_filter::dnsmasq
-    include ::ironic::config
-    include ::ironic::inspector::logging
+    include ironic::inspector::pxe_filter
+    include ironic::inspector::pxe_filter::dnsmasq
+    include ironic::config
+    include ironic::inspector::logging
   }
 }
diff --git a/manifests/profile/base/ironic_inspector/authtoken.pp b/manifests/profile/base/ironic_inspector/authtoken.pp
index 0d39b6978..67785070e 100644
--- a/manifests/profile/base/ironic_inspector/authtoken.pp
+++ b/manifests/profile/base/ironic_inspector/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::ironic_inspector::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::ironic::inspector::authtoken':
+    class { 'ironic::inspector::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/keepalived.pp b/manifests/profile/base/keepalived.pp
index a841e068d..00a2a0122 100644
--- a/manifests/profile/base/keepalived.pp
+++ b/manifests/profile/base/keepalived.pp
@@ -71,7 +71,7 @@ class tripleo::profile::base::keepalived (
         $public_detected_interface = $public_virtual_interface
       }
 
-      class { '::tripleo::keepalived':
+      class { 'tripleo::keepalived':
         control_virtual_interface => $control_detected_interface,
         public_virtual_interface  => $public_detected_interface,
       }
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index eb40e06fe..3c119a9e5 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -230,7 +230,7 @@ class tripleo::profile::base::keystone (
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::keystone':
+    class { 'keystone':
       sync_db                    => $sync_db,
       enable_bootstrap           => $sync_db,
       default_transport_url      => os_transport_url({
@@ -255,18 +255,18 @@ class tripleo::profile::base::keystone (
     }
 
     if 'amqp' in [$oslomsg_rpc_proto, $oslomsg_notify_proto]{
-      include ::keystone::messaging::amqp
+      include keystone::messaging::amqp
     }
 
-    include ::keystone::config
-    include ::keystone::logging
-    include ::tripleo::profile::base::apache
-    class { '::keystone::wsgi::apache':
+    include keystone::config
+    include keystone::logging
+    include tripleo::profile::base::apache
+    class { 'keystone::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
-    include ::keystone::cors
-    include ::keystone::security_compliance
+    include keystone::cors
+    include keystone::security_compliance
 
     if $ldap_backend_enable {
       validate_legacy(Hash, 'validate_hash', $ldap_backends_config)
@@ -282,20 +282,20 @@ class tripleo::profile::base::keystone (
     }
 
     if $keystone_federation_enabled {
-      include ::keystone::federation
+      include keystone::federation
     }
 
     if $keystone_openidc_enabled {
       $memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
 
-      class { '::keystone::federation::openidc':
+      class { 'keystone::federation::openidc':
         memcached_servers => $memcached_servers,
       }
     }
   }
 
   if $step >= 4 and $manage_db_purge {
-    include ::keystone::cron::token_flush
+    include keystone::cron::token_flush
   }
 
   if $step == 3 and $manage_domain {
@@ -328,7 +328,7 @@ class tripleo::profile::base::keystone (
     } else {
       $admin_roles = ['admin']
     }
-    class { '::keystone::roles::admin':
+    class { 'keystone::roles::admin':
       admin_roles => $admin_roles,
     }
 
@@ -349,88 +349,88 @@ class tripleo::profile::base::keystone (
   }
 
   if $step == 3 and $manage_endpoint {
-    include ::keystone::endpoint
+    include keystone::endpoint
     if hiera('aodh_api_enabled', false) {
-      include ::aodh::keystone::auth
+      include aodh::keystone::auth
     }
     if hiera('barbican_api_enabled', false) {
-      include ::barbican::keystone::auth
+      include barbican::keystone::auth
     }
     # ceilometer user is needed even when ceilometer api
     # not running, so it can authenticate with keystone
     # and dispatch data.
     if hiera('ceilometer_auth_enabled', false) {
-      include ::ceilometer::keystone::auth
+      include ceilometer::keystone::auth
     }
     if hiera('ceph_rgw_enabled', false) {
-      include ::ceph::rgw::keystone::auth
+      include ceph::rgw::keystone::auth
     }
     if hiera('cinder_api_enabled', false) {
-      include ::cinder::keystone::auth
+      include cinder::keystone::auth
     }
     if hiera('designate_api_enabled', false) {
-      include ::designate::keystone::auth
+      include designate::keystone::auth
     }
     if hiera('glance_api_enabled', false) {
-      include ::glance::keystone::auth
+      include glance::keystone::auth
     }
     if hiera('gnocchi_api_enabled', false) {
-      include ::gnocchi::keystone::auth
+      include gnocchi::keystone::auth
     }
     if hiera('heat_api_enabled', false) {
-      include ::heat::keystone::auth
+      include heat::keystone::auth
     }
     if hiera('heat_api_cfn_enabled', false) {
-      include ::heat::keystone::auth_cfn
+      include heat::keystone::auth_cfn
     }
     if hiera('ironic_api_enabled', false) {
-      include ::ironic::keystone::auth
+      include ironic::keystone::auth
     }
     if hiera('ironic_inspector_enabled', false) {
-      include ::ironic::keystone::auth_inspector
+      include ironic::keystone::auth_inspector
     }
     if hiera('manila_api_enabled', false) {
-      include ::manila::keystone::auth
+      include manila::keystone::auth
     }
     if hiera('mistral_api_enabled', false) {
-      include ::mistral::keystone::auth
+      include mistral::keystone::auth
     }
     if hiera('neutron_api_enabled', false) {
-      include ::neutron::keystone::auth
+      include neutron::keystone::auth
     }
     if hiera('nova_api_enabled', false) {
-      include ::nova::keystone::auth
+      include nova::keystone::auth
     }
     if hiera('placement_enabled', false) {
-      include ::placement::keystone::auth
+      include placement::keystone::auth
     }
     if hiera('octavia_api_enabled', false) {
-      include ::octavia::keystone::auth
+      include octavia::keystone::auth
     }
     if hiera('panko_api_enabled', false) {
-      include ::panko::keystone::auth
+      include panko::keystone::auth
     }
     if hiera('sahara_api_enabled', false) {
-      include ::sahara::keystone::auth
+      include sahara::keystone::auth
     }
     if hiera('swift_proxy_enabled', false) or hiera('external_swift_proxy_enabled',false) {
-      include ::swift::keystone::auth
+      include swift::keystone::auth
     }
     if hiera('trove_api_enabled', false) {
-      include ::trove::keystone::auth
+      include trove::keystone::auth
     }
     if hiera('zaqar_api_enabled', false) {
-      include ::zaqar::keystone::auth
-      include ::zaqar::keystone::auth_websocket
+      include zaqar::keystone::auth
+      include zaqar::keystone::auth_websocket
     }
     if hiera('ec2_api_enabled', false) {
-      include ::ec2api::keystone::auth
+      include ec2api::keystone::auth
     }
     if hiera('novajoin_enabled', false) {
-      include ::nova::metadata::novajoin::auth
+      include nova::metadata::novajoin::auth
     }
     if hiera('veritas_hyperscale_controller_enabled', false) {
-      include ::veritas_hyperscale::hs_keystone
+      include veritas_hyperscale::hs_keystone
     }
   }
 }
diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp
index fc455a091..59d3452a8 100644
--- a/manifests/profile/base/logging/fluentd.pp
+++ b/manifests/profile/base/logging/fluentd.pp
@@ -122,8 +122,8 @@ class tripleo::profile::base::logging::fluentd (
   if $step >= 4 {
     warning('Service fluentd is deprecated. Please take in mind, that it going to be removed in T release.')
 
-    include ::fluentd
-    include ::systemd::systemctl::daemon_reload
+    include fluentd
+    include systemd::systemctl::daemon_reload
 
     $_fluentd_service_user = pick($fluentd_service_user,
                                   $::fluentd::config_owner,
diff --git a/manifests/profile/base/logging/rsyslog.pp b/manifests/profile/base/logging/rsyslog.pp
index 47e77e83d..33e3b8bc3 100644
--- a/manifests/profile/base/logging/rsyslog.pp
+++ b/manifests/profile/base/logging/rsyslog.pp
@@ -111,7 +111,7 @@ class tripleo::profile::base::logging::rsyslog (
       }
     }
 
-    class { '::rsyslog::server':
+    class { 'rsyslog::server':
       modules => $modules,
       actions => $actions
     }
diff --git a/manifests/profile/base/login_defs.pp b/manifests/profile/base/login_defs.pp
index 4beb24e39..281cbc0e8 100644
--- a/manifests/profile/base/login_defs.pp
+++ b/manifests/profile/base/login_defs.pp
@@ -52,7 +52,7 @@ class tripleo::profile::base::login_defs (
   $fail_delay        = hiera('fail_delay', 4),
   $step              = Integer(hiera('step'))
 ) {
-  include ::tripleo::profile::base::login_defs
+  include tripleo::profile::base::login_defs
 
   if $step >= 1 {
     package { 'shadow-utils':
diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp
index c5aea7c1d..b75136e21 100644
--- a/manifests/profile/base/manila.pp
+++ b/manifests/profile/base/manila.pp
@@ -99,7 +99,7 @@ class tripleo::profile::base::manila (
   if $step >= 4 or ($step >= 3 and $sync_db) {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::manila' :
+    class { 'manila' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
@@ -117,7 +117,7 @@ class tripleo::profile::base::manila (
         'ssl'       => $oslomsg_notify_use_ssl_real,
       }),
     }
-    include ::manila::config
-    include ::manila::logging
+    include manila::config
+    include manila::logging
   }
 }
diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index b3a1b6c7c..fe2036494 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -96,8 +96,8 @@ class tripleo::profile::base::manila::api (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::manila
-  include ::tripleo::profile::base::manila::authtoken
+  include tripleo::profile::base::manila
+  include tripleo::profile::base::manila::authtoken
 
   if $enable_internal_tls {
     if !$manila_api_network {
@@ -111,7 +111,7 @@ class tripleo::profile::base::manila::api (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::tripleo::profile::base::apache
+    include tripleo::profile::base::apache
     if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled or
       $backend_isilon_enabled or $backend_unity_enabled or $backend_vnx_enabled {
         $nfs_protocol = 'NFS'
@@ -125,10 +125,10 @@ class tripleo::profile::base::manila::api (
     } else {
       $cephfs_protocol = undef
     }
-    class { '::manila::api' :
+    class { 'manila::api' :
       enabled_share_protocols => join(delete_undef_values([$nfs_protocol,$cifs_protocol,$cephfs_protocol]), ',')
     }
-    class { '::manila::wsgi::apache':
+    class { 'manila::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/manila/authtoken.pp b/manifests/profile/base/manila/authtoken.pp
index 427856fe6..9a88513a1 100644
--- a/manifests/profile/base/manila/authtoken.pp
+++ b/manifests/profile/base/manila/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::manila::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::manila::keystone::authtoken':
+    class { 'manila::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/manila/scheduler.pp b/manifests/profile/base/manila/scheduler.pp
index 5c94bbea1..5b4463d8c 100644
--- a/manifests/profile/base/manila/scheduler.pp
+++ b/manifests/profile/base/manila/scheduler.pp
@@ -26,11 +26,11 @@
 class tripleo::profile::base::manila::scheduler (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::manila
+  include tripleo::profile::base::manila
 
   if $step >= 4 {
-    include ::manila::compute::nova
-    include ::manila::network::neutron
-    include ::manila::scheduler
+    include manila::compute::nova
+    include manila::network::neutron
+    include manila::scheduler
   }
 }
diff --git a/manifests/profile/base/manila/share.pp b/manifests/profile/base/manila/share.pp
index 76519b708..b3cc85807 100644
--- a/manifests/profile/base/manila/share.pp
+++ b/manifests/profile/base/manila/share.pp
@@ -66,10 +66,10 @@ class tripleo::profile::base::manila::share (
   $manila_user_enabled_backends = hiera('manila_user_enabled_backends', undef),
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::manila
+  include tripleo::profile::base::manila
 
   if $step >= 4 {
-    include ::manila::share
+    include manila::share
 
     # manila generic:
     if $backend_generic_enabled {
@@ -96,7 +96,7 @@ class tripleo::profile::base::manila::share (
         "${manila_generic_backend}/service_instance_flavor_id": value => $service_instance_flavor_id;
       }
 
-      include ::manila::volume::cinder
+      include manila::volume::cinder
     }
 
     # manila cephfs:
@@ -257,7 +257,7 @@ class tripleo::profile::base::manila::share (
                                       $manila_user_enabled_backends))
     $manila_enabled_backends = delete($backends, '')
 
-    class { '::manila::backends' :
+    class { 'manila::backends' :
       enabled_share_backends => $manila_enabled_backends,
     }
   }
diff --git a/manifests/profile/base/memcached.pp b/manifests/profile/base/memcached.pp
index e33999a12..5ef8d823a 100644
--- a/manifests/profile/base/memcached.pp
+++ b/manifests/profile/base/memcached.pp
@@ -27,6 +27,6 @@ class tripleo::profile::base::memcached (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 1 {
-      include ::memcached
+      include memcached
   }
 }
diff --git a/manifests/profile/base/metrics/collectd.pp b/manifests/profile/base/metrics/collectd.pp
index 564d84955..63a844d6f 100644
--- a/manifests/profile/base/metrics/collectd.pp
+++ b/manifests/profile/base/metrics/collectd.pp
@@ -277,7 +277,7 @@ class tripleo::profile::base::metrics::collectd (
       manage_repo => $collectd_manage_repo
     }
 
-    class { '::collectd::plugin::python':
+    class { 'collectd::plugin::python':
       logtraces   => true,
     }
 
@@ -287,7 +287,7 @@ class tripleo::profile::base::metrics::collectd (
     }
 
     if $enable_file_logging {
-      include ::collectd::plugin::logfile
+      include collectd::plugin::logfile
     }
 
     if ! ($collectd_securitylevel in [undef, 'None', 'Sign', 'Encrypt']) {
@@ -342,7 +342,7 @@ class tripleo::profile::base::metrics::collectd (
       } else {
         $connect_to = $amqp_host
       }
-      class { '::collectd::plugin::amqp1':
+      class { 'collectd::plugin::amqp1':
         ensure         => 'present',
         manage_package => true,
         transport      => $amqp_transport_name,
@@ -386,7 +386,7 @@ class tripleo::profile::base::metrics::collectd (
     }
 
     if $enable_sensubility {
-      include ::tripleo::profile::base::metrics::collectd::sensubility
+      include tripleo::profile::base::metrics::collectd::sensubility
     }
   }
 }
diff --git a/manifests/profile/base/metrics/collectd/gnocchi.pp b/manifests/profile/base/metrics/collectd/gnocchi.pp
index 06ec79bae..9115c794d 100644
--- a/manifests/profile/base/metrics/collectd/gnocchi.pp
+++ b/manifests/profile/base/metrics/collectd/gnocchi.pp
@@ -137,7 +137,7 @@ define tripleo::profile::base::metrics::collectd::gnocchi (
   $resource_type                = 'collectd',
   $batch_size                   = 10,
 ) {
-  include ::collectd
+  include collectd
 
   package { 'python-collectd-gnocchi':
     ensure => $ensure,
diff --git a/manifests/profile/base/metrics/collectd/sensubility.pp b/manifests/profile/base/metrics/collectd/sensubility.pp
index 9dece1942..dfa49fbb5 100644
--- a/manifests/profile/base/metrics/collectd/sensubility.pp
+++ b/manifests/profile/base/metrics/collectd/sensubility.pp
@@ -110,8 +110,8 @@ class tripleo::profile::base::metrics::collectd::sensubility (
   $amqp_user          = undef,
   $amqp_password      = undef
 ) {
-  include ::collectd
-  include ::collectd::plugin::exec
+  include collectd
+  include collectd::plugin::exec
 
   package { 'collectd-sensubility':
     ensure => $ensure,
diff --git a/manifests/profile/base/metrics/collectd/sqlalchemy_collectd.pp b/manifests/profile/base/metrics/collectd/sqlalchemy_collectd.pp
index c21c302d0..cdd070e14 100644
--- a/manifests/profile/base/metrics/collectd/sqlalchemy_collectd.pp
+++ b/manifests/profile/base/metrics/collectd/sqlalchemy_collectd.pp
@@ -36,7 +36,7 @@ define tripleo::profile::base::metrics::collectd::sqlalchemy_collectd (
   $log_messages   = 'info',
 
 ) {
-  include ::collectd
+  include collectd
 
   package { 'python-collectd-sqlalchemy':
     ensure => 'present',
diff --git a/manifests/profile/base/metrics/qdr.pp b/manifests/profile/base/metrics/qdr.pp
index c76d5773c..8cc90031d 100644
--- a/manifests/profile/base/metrics/qdr.pp
+++ b/manifests/profile/base/metrics/qdr.pp
@@ -209,7 +209,7 @@ class tripleo::profile::base::metrics::qdr (
       $listen_on = $listener_addr
     }
 
-    class { '::qdr':
+    class { 'qdr':
       listener_addr            => $listen_on,
       listener_port            => $listener_port,
       listener_require_encrypt => $listener_require_encrypt,
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index c5bb650d0..5018b6002 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -118,10 +118,10 @@ class tripleo::profile::base::mistral (
         'ssl'       => $oslomsg_notify_use_ssl_real,
       }),
     }
-    include ::mistral::config
-    include ::mistral::logging
-    include ::mistral::client
-    include ::mistral::db::sync
-    include ::mistral::cors
+    include mistral::config
+    include mistral::logging
+    include mistral::client
+    include mistral::db::sync
+    include mistral::cors
   }
 }
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index eb6fe2ea2..f4ce408fd 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -66,7 +66,7 @@ class tripleo::profile::base::mistral::api (
     $is_bootstrap = false
   }
 
-  include ::tripleo::profile::base::mistral
+  include tripleo::profile::base::mistral
 
   if $enable_internal_tls {
     if !$mistral_api_network {
@@ -80,13 +80,13 @@ class tripleo::profile::base::mistral::api (
   }
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::mistral::api
-    include ::mistral::cron_trigger
+    include mistral::api
+    include mistral::cron_trigger
     # Temporarily disable Mistral API deployed in WSGI
     # https://bugs.launchpad.net/tripleo/+bug/1724607
     if $mistral_api_wsgi_enabled {
-      include ::tripleo::profile::base::apache
-      class { '::mistral::wsgi::apache':
+      include tripleo::profile::base::apache
+      class { 'mistral::wsgi::apache':
         ssl_cert => $tls_certfile,
         ssl_key  => $tls_keyfile,
       }
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index 4c98809b5..35927cfd1 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -37,10 +37,10 @@ class tripleo::profile::base::mistral::engine (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::mistral
+  include tripleo::profile::base::mistral
 
   if $step >= 4 or ($step >= 3 and $sync_db)  {
-    include ::mistral::engine
+    include mistral::engine
   }
 
 }
diff --git a/manifests/profile/base/mistral/event_engine.pp b/manifests/profile/base/mistral/event_engine.pp
index e46677fc8..e0e8b1888 100644
--- a/manifests/profile/base/mistral/event_engine.pp
+++ b/manifests/profile/base/mistral/event_engine.pp
@@ -37,10 +37,10 @@ class tripleo::profile::base::mistral::event_engine (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::mistral
+  include tripleo::profile::base::mistral
 
   if $step >= 4 or ($step >= 3 and $sync_db)  {
-    include ::mistral::event_engine
+    include mistral::event_engine
   }
 
 }
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index 644fe345e..38a2e85c6 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -43,10 +43,10 @@ class tripleo::profile::base::mistral::executor (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::mistral
+  include tripleo::profile::base::mistral
 
   if $step >= 4 or ($step >= 3 and $sync_db)  {
-    include ::mistral::executor
+    include mistral::executor
     if $docker_group {
       ensure_resource('group', 'docker', {
         'ensure' => 'present',
diff --git a/manifests/profile/base/monitoring/sensu.pp b/manifests/profile/base/monitoring/sensu.pp
index 990e3e845..0cbaf01d3 100644
--- a/manifests/profile/base/monitoring/sensu.pp
+++ b/manifests/profile/base/monitoring/sensu.pp
@@ -26,7 +26,7 @@ class tripleo::profile::base::monitoring::sensu (
   $step = Integer(hiera('step')),
 ) {
   warning('Service sensu-client is deprecated. Please take in mind, that it is going to be removed in T release.')
-  include ::sensu
+  include sensu
   package { 'osops-tools-monitoring-oschecks':
     ensure => 'present'
   }
diff --git a/manifests/profile/base/monitoring/uchiwa.pp b/manifests/profile/base/monitoring/uchiwa.pp
index 3723609fb..13c6a3506 100644
--- a/manifests/profile/base/monitoring/uchiwa.pp
+++ b/manifests/profile/base/monitoring/uchiwa.pp
@@ -27,6 +27,6 @@ class tripleo::profile::base::monitoring::uchiwa (
 ) {
   warning('Service uchiwa is deprecated. Please take in mind, that it is going to be removed in T release.')
   if $step >= 3 {
-    include ::uchiwa
+    include uchiwa
   }
 }
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index 6278cce90..c4bb19f34 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -120,7 +120,7 @@ class tripleo::profile::base::neutron (
       $oslomsg_rpc_hosts_real = $oslomsg_rpc_hosts
     }
 
-    class { '::neutron' :
+    class { 'neutron' :
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts_real,
@@ -139,7 +139,7 @@ class tripleo::profile::base::neutron (
       }),
       dhcp_agents_per_network    => $dhcp_agents_per_net,
     }
-    include ::neutron::config
-    include ::neutron::logging
+    include neutron::config
+    include neutron::logging
   }
 }
diff --git a/manifests/profile/base/neutron/agents/bagpipe.pp b/manifests/profile/base/neutron/agents/bagpipe.pp
index de5bc17a6..3073516be 100644
--- a/manifests/profile/base/neutron/agents/bagpipe.pp
+++ b/manifests/profile/base/neutron/agents/bagpipe.pp
@@ -29,9 +29,9 @@
 class tripleo::profile::base::neutron::agents::bagpipe (
   $step           = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    include ::neutron::agents::bagpipe
+    include neutron::agents::bagpipe
   }
 }
diff --git a/manifests/profile/base/neutron/agents/bigswitch.pp b/manifests/profile/base/neutron/agents/bigswitch.pp
index e79c8a226..c0316634e 100644
--- a/manifests/profile/base/neutron/agents/bigswitch.pp
+++ b/manifests/profile/base/neutron/agents/bigswitch.pp
@@ -26,6 +26,6 @@ class tripleo::profile::base::neutron::agents::bigswitch(
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::neutron::agents::bigswitch
+    include neutron::agents::bigswitch
   }
 }
diff --git a/manifests/profile/base/neutron/agents/l2gw.pp b/manifests/profile/base/neutron/agents/l2gw.pp
index a728fa32b..0e57f91d0 100644
--- a/manifests/profile/base/neutron/agents/l2gw.pp
+++ b/manifests/profile/base/neutron/agents/l2gw.pp
@@ -30,6 +30,6 @@ class tripleo::profile::base::neutron::agents::l2gw (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::neutron::agents::l2gw
+    include neutron::agents::l2gw
   }
 }
diff --git a/manifests/profile/base/neutron/agents/mlnx.pp b/manifests/profile/base/neutron/agents/mlnx.pp
index 76e308bfc..e1d2a4f45 100644
--- a/manifests/profile/base/neutron/agents/mlnx.pp
+++ b/manifests/profile/base/neutron/agents/mlnx.pp
@@ -29,6 +29,6 @@ class tripleo::profile::base::neutron::agents::mlnx(
 
   if $step >= 3 {
 
-    include ::neutron::agents::ml2::mlnx
+    include neutron::agents::ml2::mlnx
   }
 }
diff --git a/manifests/profile/base/neutron/agents/networking_baremetal.pp b/manifests/profile/base/neutron/agents/networking_baremetal.pp
index 451147855..0a96dd6c3 100644
--- a/manifests/profile/base/neutron/agents/networking_baremetal.pp
+++ b/manifests/profile/base/neutron/agents/networking_baremetal.pp
@@ -28,9 +28,9 @@ class tripleo::profile::base::neutron::agents::networking_baremetal(
   $step               = Integer(hiera('step'))
 ) {
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 5 {
-    include ::neutron::agents::ml2::networking_baremetal
+    include neutron::agents::ml2::networking_baremetal
   }
 }
diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp
index 0eab1852d..f7bb5507b 100644
--- a/manifests/profile/base/neutron/agents/nuage.pp
+++ b/manifests/profile/base/neutron/agents/nuage.pp
@@ -51,10 +51,10 @@ class tripleo::profile::base::neutron::agents::nuage (
   $step                    = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::nuage::vrs
+    include nuage::vrs
 
     if $enable_metadata_agent {
-      class { '::nuage::metadataagent':
+      class { 'nuage::metadataagent':
         nova_os_tenant_name => $nova_os_tenant_name,
         nova_os_password    => $nova_os_password,
         nova_metadata_ip    => $nova_metadata_ip,
diff --git a/manifests/profile/base/neutron/agents/ovn.pp b/manifests/profile/base/neutron/agents/ovn.pp
index d22921cbc..dc33cca95 100644
--- a/manifests/profile/base/neutron/agents/ovn.pp
+++ b/manifests/profile/base/neutron/agents/ovn.pp
@@ -40,7 +40,7 @@ class tripleo::profile::base::neutron::agents::ovn (
   $step           = Integer(hiera('step'))
 ) {
   if $step >= 4 {
-    class { '::ovn::controller':
+    class { 'ovn::controller':
       ovn_remote     => join([$protocol, normalize_ip_for_uri($ovn_db_host), "${ovn_sbdb_port}"], ':'),
     }
   }
diff --git a/manifests/profile/base/neutron/agents/vpp.pp b/manifests/profile/base/neutron/agents/vpp.pp
index 6c55b8674..d7d7474de 100644
--- a/manifests/profile/base/neutron/agents/vpp.pp
+++ b/manifests/profile/base/neutron/agents/vpp.pp
@@ -41,7 +41,7 @@ class tripleo::profile::base::neutron::agents::vpp(
   }
 
   if $step >= 4 {
-    class { '::neutron::agents::ml2::vpp':
+    class { 'neutron::agents::ml2::vpp':
       etcd_host => $etcd_host,
       etcd_port => $etcd_port,
     }
diff --git a/manifests/profile/base/neutron/authtoken.pp b/manifests/profile/base/neutron/authtoken.pp
index f60e63783..2cc2cca27 100644
--- a/manifests/profile/base/neutron/authtoken.pp
+++ b/manifests/profile/base/neutron/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::neutron::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::neutron::keystone::authtoken':
+    class { 'neutron::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/neutron/bgpvpn.pp b/manifests/profile/base/neutron/bgpvpn.pp
index b2187df51..c044c5f2f 100644
--- a/manifests/profile/base/neutron/bgpvpn.pp
+++ b/manifests/profile/base/neutron/bgpvpn.pp
@@ -29,9 +29,9 @@
 class tripleo::profile::base::neutron::bgpvpn (
   $step           = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    include ::neutron::services::bgpvpn
+    include neutron::services::bgpvpn
   }
 }
diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp
index 54904f2e5..bc80d3e96 100644
--- a/manifests/profile/base/neutron/dhcp.pp
+++ b/manifests/profile/base/neutron/dhcp.pp
@@ -27,8 +27,8 @@ class tripleo::profile::base::neutron::dhcp (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::neutron
-    include ::neutron::agents::dhcp
+    include tripleo::profile::base::neutron
+    include neutron::agents::dhcp
 
     Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-dhcp' |>
   }
diff --git a/manifests/profile/base/neutron/l2gw.pp b/manifests/profile/base/neutron/l2gw.pp
index cd6239ee4..2f66de665 100644
--- a/manifests/profile/base/neutron/l2gw.pp
+++ b/manifests/profile/base/neutron/l2gw.pp
@@ -29,9 +29,9 @@
 class tripleo::profile::base::neutron::l2gw (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    include ::neutron::services::l2gw
+    include neutron::services::l2gw
   }
 }
diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp
index 90d8ace21..5d4bab2a8 100644
--- a/manifests/profile/base/neutron/l3.pp
+++ b/manifests/profile/base/neutron/l3.pp
@@ -27,8 +27,8 @@ class tripleo::profile::base::neutron::l3 (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::neutron
-    include ::neutron::agents::l3
+    include tripleo::profile::base::neutron
+    include neutron::agents::l3
 
     Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-l3' |>
   }
diff --git a/manifests/profile/base/neutron/linuxbridge.pp b/manifests/profile/base/neutron/linuxbridge.pp
index 36be214b2..9899786b4 100644
--- a/manifests/profile/base/neutron/linuxbridge.pp
+++ b/manifests/profile/base/neutron/linuxbridge.pp
@@ -12,9 +12,9 @@
 class tripleo::profile::base::neutron::linuxbridge(
     $step           = Integer(hiera('step')),
 ) {
-    include ::tripleo::profile::base::neutron
+    include tripleo::profile::base::neutron
 
     if $step >= 5 {
-        include ::neutron::agents::ml2::linuxbridge
+        include neutron::agents::ml2::linuxbridge
     }
 }
diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp
index 66de88331..e5159136d 100644
--- a/manifests/profile/base/neutron/metadata.pp
+++ b/manifests/profile/base/neutron/metadata.pp
@@ -27,8 +27,8 @@ class tripleo::profile::base::neutron::metadata (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::neutron
-    include ::neutron::agents::metadata
+    include tripleo::profile::base::neutron
+    include neutron::agents::metadata
 
     Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-metadata' |>
   }
diff --git a/manifests/profile/base/neutron/n1k.pp b/manifests/profile/base/neutron/n1k.pp
index e61023d83..09d3ce9d4 100644
--- a/manifests/profile/base/neutron/n1k.pp
+++ b/manifests/profile/base/neutron/n1k.pp
@@ -36,16 +36,16 @@ class tripleo::profile::base::neutron::n1k (
   $n1kv_version = hiera('n1kv_vem_version', undef),
   $step         = Integer(hiera('step')),
 ) {
-  include ::neutron::plugins::ml2::cisco::nexus1000v
-  include ::tripleo::profile::base::neutron
+  include neutron::plugins::ml2::cisco::nexus1000v
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    class { '::neutron::agents::n1kv_vem':
+    class { 'neutron::agents::n1kv_vem':
       n1kv_source  => $n1kv_source,
       n1kv_version => $n1kv_version,
     }
 
-    class { '::n1k_vsm':
+    class { 'n1k_vsm':
       n1kv_source       => $n1kv_source,
       n1kv_version      => $n1kv_version,
       pacemaker_control => false,
diff --git a/manifests/profile/base/neutron/opencontrail/vrouter.pp b/manifests/profile/base/neutron/opencontrail/vrouter.pp
index 4330dc479..f2552a246 100644
--- a/manifests/profile/base/neutron/opencontrail/vrouter.pp
+++ b/manifests/profile/base/neutron/opencontrail/vrouter.pp
@@ -28,7 +28,7 @@ class tripleo::profile::base::neutron::opencontrail::vrouter (
 
   if $step >= 4 {
 
-    include ::contrail::vrouter
+    include contrail::vrouter
     # NOTE: it's not possible to use this class without a functional
     # contrail controller up and running
     #class {'::contrail::vrouter::provision_vrouter':
diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
index b93103f21..e7810e415 100644
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -66,7 +66,7 @@ class tripleo::profile::base::neutron::opendaylight (
     } elsif size($odl_api_ips) == 2 {
       fail('2 node OpenDaylight deployments are unsupported.  Use 1 or greater than 2')
     } elsif size($odl_api_ips) > 2 {
-      class { '::opendaylight':
+      class { 'opendaylight':
         enable_ha     => true,
         ha_node_ips   => $odl_api_ips,
         enable_tls    => $enable_internal_tls,
@@ -74,7 +74,7 @@ class tripleo::profile::base::neutron::opendaylight (
         tls_cert_file => $tls_certfile
       }
     } else {
-      class { '::opendaylight':
+      class { 'opendaylight':
         enable_tls    => $enable_internal_tls,
         tls_key_file  => $tls_keyfile,
         tls_cert_file => $tls_certfile
diff --git a/manifests/profile/base/neutron/ovn_metadata.pp b/manifests/profile/base/neutron/ovn_metadata.pp
index f8d09c851..2e02506d4 100644
--- a/manifests/profile/base/neutron/ovn_metadata.pp
+++ b/manifests/profile/base/neutron/ovn_metadata.pp
@@ -64,8 +64,8 @@ class tripleo::profile::base::neutron::ovn_metadata (
   $ovn_remote_probe_interval = 60000,
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::neutron
-    class { '::neutron::agents::ovn_metadata':
+    include tripleo::profile::base::neutron
+    class { 'neutron::agents::ovn_metadata':
         ovn_sb_connection         => join(["${protocol}", normalize_ip_for_uri($ovn_db_host), "${ovn_sb_port}"], ':'),
         ovn_sb_private_key        => $ovn_sb_private_key,
         ovn_sb_certificate        => $ovn_sb_certificate,
diff --git a/manifests/profile/base/neutron/ovn_northd.pp b/manifests/profile/base/neutron/ovn_northd.pp
index ab4d5b8aa..b1ba8be68 100644
--- a/manifests/profile/base/neutron/ovn_northd.pp
+++ b/manifests/profile/base/neutron/ovn_northd.pp
@@ -33,7 +33,7 @@ class tripleo::profile::base::neutron::ovn_northd (
     # Note this only runs on the first node in the cluster when
     # deployed on a role where multiple nodes exist.
     if $::hostname == downcase($bootstrap_node) {
-      include ::ovn::northd
+      include ovn::northd
     }
   }
 }
diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp
index c45a57fb0..c60f02e9d 100644
--- a/manifests/profile/base/neutron/ovs.pp
+++ b/manifests/profile/base/neutron/ovs.pp
@@ -42,7 +42,7 @@ class tripleo::profile::base::neutron::ovs(
   $vhostuser_socket_group = hiera('vhostuser_socket_group', 'qemu'),
   $vhostuser_socket_user  = hiera('vhostuser_socket_user', 'qemu'),
 ) {
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 3 {
     if $vhostuser_socket_dir {
@@ -56,7 +56,7 @@ class tripleo::profile::base::neutron::ovs(
   }
 
   if $step >= 5 {
-    include ::neutron::agents::ml2::ovs
+    include neutron::agents::ml2::ovs
 
     # Optional since manage_service may be false and neutron server may not be colocated.
     Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-ovs-agent-service' |>
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 23a9da8f3..6f6f0aa46 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -50,69 +50,69 @@ class tripleo::profile::base::neutron::plugins::ml2 (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::ml2
+    include neutron::plugins::ml2
 
     if 'cisco_n1kv' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::n1k
+      include tripleo::profile::base::neutron::n1k
     }
 
     if 'cisco_ucsm' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::cisco::ucsm
+      include neutron::plugins::ml2::cisco::ucsm
     }
 
     if 'cisco_nexus'  in $mechanism_drivers {
-      include ::neutron::plugins::ml2::cisco::nexus
-      include ::neutron::plugins::ml2::cisco::type_nexus_vxlan
+      include neutron::plugins::ml2::cisco::nexus
+      include neutron::plugins::ml2::cisco::type_nexus_vxlan
     }
 
     if 'bsn_ml2' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::bigswitch::restproxy
+      include neutron::plugins::ml2::bigswitch::restproxy
     }
 
     if ('opendaylight' in $mechanism_drivers) or ('opendaylight_v2' in $mechanism_drivers) {
-      include ::tripleo::profile::base::neutron::plugins::ml2::opendaylight
+      include tripleo::profile::base::neutron::plugins::ml2::opendaylight
     }
 
     if 'ovn' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::plugins::ml2::ovn
+      include tripleo::profile::base::neutron::plugins::ml2::ovn
     }
 
     if 'fujitsu_cfab' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::fujitsu
-      include ::neutron::plugins::ml2::fujitsu::cfab
+      include neutron::plugins::ml2::fujitsu
+      include neutron::plugins::ml2::fujitsu::cfab
     }
 
     if 'fujitsu_fossw' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::fujitsu
-      include ::neutron::plugins::ml2::fujitsu::fossw
+      include neutron::plugins::ml2::fujitsu
+      include neutron::plugins::ml2::fujitsu::fossw
     }
 
     if 'vpp' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::plugins::ml2::vpp
+      include tripleo::profile::base::neutron::plugins::ml2::vpp
     }
 
     if 'nuage' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::plugins::ml2::nuage
+      include tripleo::profile::base::neutron::plugins::ml2::nuage
     }
 
     if 'cisco_vts' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::plugins::ml2::vts
+      include tripleo::profile::base::neutron::plugins::ml2::vts
     }
 
     if 'mlnx_sdn_assist' in  $mechanism_drivers {
-      include ::neutron::plugins::ml2::mellanox
-      include ::neutron::plugins::ml2::mellanox::mlnx_sdn_assist
+      include neutron::plugins::ml2::mellanox
+      include neutron::plugins::ml2::mellanox::mlnx_sdn_assist
     }
 
     if 'baremetal' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::plugins::ml2::networking_baremetal
+      include tripleo::profile::base::neutron::plugins::ml2::networking_baremetal
     }
 
     if ('ansible' in $mechanism_drivers) and ('neutron_plugin_ml2_ansible' in $service_names) {
-      include ::tripleo::profile::base::neutron::plugins::ml2::networking_ansible
+      include tripleo::profile::base::neutron::plugins::ml2::networking_ansible
     }
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
index 44521efde..484d0b29a 100644
--- a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
@@ -29,9 +29,9 @@
 class tripleo::profile::base::neutron::plugins::ml2::bagpipe (
   $step           = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    include ::neutron::plugins::ml2::bagpipe
+    include neutron::plugins::ml2::bagpipe
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/ml2/networking_ansible.pp b/manifests/profile/base/neutron/plugins/ml2/networking_ansible.pp
index fd684e6bd..6cbed9524 100644
--- a/manifests/profile/base/neutron/plugins/ml2/networking_ansible.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/networking_ansible.pp
@@ -43,7 +43,7 @@ class tripleo::profile::base::neutron::plugins::ml2::networking_ansible(
   $step                   = Integer(hiera('step'))
 ) {
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $enable_internal_tls {
     $tls_query_param = '?ssl=true'
@@ -52,7 +52,7 @@ class tripleo::profile::base::neutron::plugins::ml2::networking_ansible(
   }
 
   if $step >= 4 {
-    class { '::neutron::plugins::ml2::networking_ansible':
+    class { 'neutron::plugins::ml2::networking_ansible':
       coordination_url => join(['redis://:', $neutron_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param])
     }
   }
diff --git a/manifests/profile/base/neutron/plugins/ml2/networking_baremetal.pp b/manifests/profile/base/neutron/plugins/ml2/networking_baremetal.pp
index 3f4becd76..b246c5050 100644
--- a/manifests/profile/base/neutron/plugins/ml2/networking_baremetal.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/networking_baremetal.pp
@@ -28,9 +28,9 @@ class tripleo::profile::base::neutron::plugins::ml2::networking_baremetal(
   $step               = Integer(hiera('step'))
 ) {
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    include ::neutron::plugins::ml2::networking_baremetal
+    include neutron::plugins::ml2::networking_baremetal
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/ml2/nuage.pp b/manifests/profile/base/neutron/plugins/ml2/nuage.pp
index 44f69fc04..8212656c8 100644
--- a/manifests/profile/base/neutron/plugins/ml2/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/nuage.pp
@@ -31,10 +31,10 @@ class tripleo::profile::base::neutron::plugins::ml2::nuage (
 ) {
 
   if $step >= 4 {
-    include ::neutron::plugins::ml2::nuage
+    include neutron::plugins::ml2::nuage
 
     if $enable_vrs {
-      include ::nuage::vrs
+      include nuage::vrs
     }
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
index a1f0e1ffa..e4d1b87a9 100644
--- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
@@ -79,7 +79,7 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight (
       if empty($odl_url_ip) { fail('OpenDaylight API VIP is Empty') }
       $odl_url_addr = $odl_url_ip
     }
-    class { '::neutron::plugins::ml2::opendaylight':
+    class { 'neutron::plugins::ml2::opendaylight':
       odl_username => $odl_username,
       odl_password => $odl_password,
       odl_url      => "${conn_proto}://${odl_url_addr}:${odl_port}/controller/nb/v2/neutron",
diff --git a/manifests/profile/base/neutron/plugins/ml2/ovn.pp b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
index c72247e98..7398e17de 100644
--- a/manifests/profile/base/neutron/plugins/ml2/ovn.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
@@ -79,7 +79,7 @@ class tripleo::profile::base::neutron::plugins::ml2::ovn (
   $step                     = Integer(hiera('step'))
 ) {
   if $step >= 4 {
-    class { '::neutron::plugins::ml2::ovn':
+    class { 'neutron::plugins::ml2::ovn':
       ovn_nb_connection  => join(["${protocol}", normalize_ip_for_uri($ovn_db_host), "${ovn_nb_port}"], ':'),
       ovn_sb_connection  => join(["${protocol}", normalize_ip_for_uri($ovn_db_host), "${ovn_sb_port}"], ':'),
       ovn_nb_private_key => $ovn_nb_private_key,
diff --git a/manifests/profile/base/neutron/plugins/ml2/vpp.pp b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
index 7d5923995..7506be776 100644
--- a/manifests/profile/base/neutron/plugins/ml2/vpp.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
@@ -41,7 +41,7 @@ class tripleo::profile::base::neutron::plugins::ml2::vpp (
   }
 
   if $step >= 4 {
-    class { '::neutron::plugins::ml2::vpp':
+    class { 'neutron::plugins::ml2::vpp':
       etcd_host => $etcd_host,
       etcd_port => $etcd_port,
     }
diff --git a/manifests/profile/base/neutron/plugins/ml2/vts.pp b/manifests/profile/base/neutron/plugins/ml2/vts.pp
index cc5ebddf2..7be2b253c 100644
--- a/manifests/profile/base/neutron/plugins/ml2/vts.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/vts.pp
@@ -43,7 +43,7 @@ class tripleo::profile::base::neutron::plugins::ml2::vts (
     if $vts_url_ip != undef {
       $vts_url_ip_out = normalize_ip_for_uri($vts_url_ip)
 
-      class { '::neutron::plugins::ml2::cisco::vts':
+      class { 'neutron::plugins::ml2::cisco::vts':
         vts_url => "https://${vts_url_ip_out}:${vts_port}/api/running/openstack"
       }
     }
diff --git a/manifests/profile/base/neutron/plugins/nsx.pp b/manifests/profile/base/neutron/plugins/nsx.pp
index 976adffba..30516d650 100644
--- a/manifests/profile/base/neutron/plugins/nsx.pp
+++ b/manifests/profile/base/neutron/plugins/nsx.pp
@@ -37,9 +37,9 @@ class tripleo::profile::base::neutron::plugins::nsx (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::nsx
+    include neutron::plugins::nsx
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 5e5f06a42..506fc9bab 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -35,9 +35,9 @@ class tripleo::profile::base::neutron::plugins::nuage (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::nuage
+    include neutron::plugins::nuage
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index 84e96301e..0ef4c36bc 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -35,9 +35,9 @@ class tripleo::profile::base::neutron::plugins::opencontrail (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::opencontrail
+    include neutron::plugins::opencontrail
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
index b6dbe23b7..a331c96e9 100644
--- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
@@ -138,7 +138,7 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight (
       $odl_ovsdb_str = join(regsubst($odl_api_ips_parsed, '.+', 'tcp:\0:6640'), ' ')
     }
 
-    class { '::neutron::plugins::ovs::opendaylight':
+    class { 'neutron::plugins::ovs::opendaylight':
       tunnel_ip       => $tunnel_ip,
       odl_check_url   => $opendaylight_url,
       odl_ovsdb_iface => $odl_ovsdb_str,
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index 826c08413..7bae8a421 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -37,9 +37,9 @@ class tripleo::profile::base::neutron::plugins::plumgrid (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::plumgrid
+    include neutron::plugins::plumgrid
   }
 }
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 3eccfd298..4b3a3c3f7 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -106,8 +106,8 @@ class tripleo::profile::base::neutron::server (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::neutron
-  include ::tripleo::profile::base::neutron::authtoken
+  include tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron::authtoken
 
   # Calculate neutron::server::l3_ha based on the number of API nodes
   # combined with if DVR is enabled.
@@ -137,22 +137,22 @@ class tripleo::profile::base::neutron::server (
       Tripleo::Tls_proxy['neutron-api'] ~> Anchor<| title == 'neutron::service::begin' |>
     }
     if $designate_api_enabled {
-      include ::neutron::designate
+      include neutron::designate
     }
-    include ::tripleo::profile::base::apache
+    include tripleo::profile::base::apache
   }
   # We start neutron-server on the bootstrap node first, because
   # it will try to populate tables and we need to make sure this happens
   # before it starts on other nodes
   if $step >= 4 and $sync_db or $step >= 5 and !$sync_db {
 
-    include ::neutron::server::notifications
+    include neutron::server::notifications
     # We need to override the hiera value neutron::server::sync_db which is set
     # to true
-    class { '::neutron::server':
+    class { 'neutron::server':
       sync_db => $sync_db,
       l3_ha   => $l3_ha,
     }
-    include ::neutron::quota
+    include neutron::quota
   }
 }
diff --git a/manifests/profile/base/neutron/sfc.pp b/manifests/profile/base/neutron/sfc.pp
index 2fce94ae0..ebd5ba295 100644
--- a/manifests/profile/base/neutron/sfc.pp
+++ b/manifests/profile/base/neutron/sfc.pp
@@ -29,9 +29,9 @@
 class tripleo::profile::base::neutron::sfc (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    include ::neutron::services::sfc
+    include neutron::services::sfc
   }
 }
diff --git a/manifests/profile/base/neutron/sriov.pp b/manifests/profile/base/neutron/sriov.pp
index d070541db..76b4d29e3 100644
--- a/manifests/profile/base/neutron/sriov.pp
+++ b/manifests/profile/base/neutron/sriov.pp
@@ -28,9 +28,9 @@ class tripleo::profile::base::neutron::sriov(
   $step               = Integer(hiera('step'))
 ) {
 
-  include ::tripleo::profile::base::neutron
+  include tripleo::profile::base::neutron
 
   if $step >= 4 {
-    include ::neutron::agents::ml2::sriov
+    include neutron::agents::ml2::sriov
   }
 }
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index ab3bab16f..d41e4af4c 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -122,14 +122,14 @@ class tripleo::profile::base::nova (
     } else {
       $oslomsg_rpc_hosts_real = $oslomsg_rpc_hosts
     }
-    include ::nova::config
-    include ::nova::logging
-    class { '::nova::cache':
+    include nova::config
+    include nova::logging
+    class { 'nova::cache':
       enabled          => $enable_cache,
       backend          => 'oslo_cache.memcache_pool',
       memcache_servers => $memcache_servers,
     }
-    class { '::nova':
+    class { 'nova':
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts_real,
@@ -147,7 +147,7 @@ class tripleo::profile::base::nova (
         'ssl'       => $oslomsg_notify_use_ssl_real,
       }),
     }
-    include ::nova::placement
-    include ::nova::keystone::service_user
+    include nova::placement
+    include nova::keystone::service_user
   }
 }
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 6762298b2..b354ab218 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -94,11 +94,11 @@ class tripleo::profile::base::nova::api (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::nova
-  include ::tripleo::profile::base::nova::authtoken
+  include tripleo::profile::base::nova
+  include tripleo::profile::base::nova::authtoken
 
   if $step >= 3 and $sync_db {
-    include ::nova::cell_v2::simple_setup
+    include nova::cell_v2::simple_setup
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
@@ -119,14 +119,14 @@ class tripleo::profile::base::nova::api (
       Tripleo::Tls_proxy['nova-metadata-api'] ~> Anchor<| title == 'nova::service::begin' |>
     }
 
-    class { '::nova::api':
+    class { 'nova::api':
       sync_db                    => $sync_db,
       sync_db_api                => $sync_db,
       nova_metadata_wsgi_enabled => $nova_metadata_wsgi_enabled,
     }
-    include ::nova::cors
-    include ::nova::network::neutron
-    include ::nova::pci
+    include nova::cors
+    include nova::network::neutron
+    include nova::pci
   }
   # Temporarily disable Nova API deployed in WSGI
   # https://bugs.launchpad.net/nova/+bug/1661360
@@ -142,8 +142,8 @@ class tripleo::profile::base::nova::api (
       $tls_keyfile = undef
     }
     if $step >= 4 or ($step >= 3 and $sync_db) {
-      include ::tripleo::profile::base::apache
-      class { '::nova::wsgi::apache_api':
+      include tripleo::profile::base::apache
+      class { 'nova::wsgi::apache_api':
         ssl_cert => $tls_certfile,
         ssl_key  => $tls_keyfile,
       }
@@ -152,9 +152,9 @@ class tripleo::profile::base::nova::api (
 
   if $step >= 5 {
     if hiera('nova_enable_db_archive', true) {
-      include ::nova::cron::archive_deleted_rows
+      include nova::cron::archive_deleted_rows
       if hiera('nova_enable_db_purge', true) {
-        include ::nova::cron::purge_shadow_tables
+        include nova::cron::purge_shadow_tables
       }
     }
 
diff --git a/manifests/profile/base/nova/authtoken.pp b/manifests/profile/base/nova/authtoken.pp
index 7eb37bcb1..dc98aa708 100644
--- a/manifests/profile/base/nova/authtoken.pp
+++ b/manifests/profile/base/nova/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::nova::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::nova::keystone::authtoken':
+    class { 'nova::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index cc5afa5b7..3e1df96c2 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -56,8 +56,8 @@ class tripleo::profile::base::nova::compute (
 
   if $step >= 4 {
     # deploy basic bits for nova
-    include ::tripleo::profile::base::nova
-    include ::nova::cinder
+    include tripleo::profile::base::nova
+    include nova::cinder
 
     if $keymgr_api_class {
       warning('The keymgr_api_class parameter is deprecated, use keymgr_backend')
@@ -67,22 +67,22 @@ class tripleo::profile::base::nova::compute (
     }
 
     # deploy basic bits for nova-compute
-    class { '::nova::compute':
+    class { 'nova::compute':
       keymgr_backend => $keymgr_backend_real,
     }
-    include ::nova::compute::pci
+    include nova::compute::pci
     # If Service['nova-conductor'] is in catalog, make sure we start it
     # before nova-compute.
     Service<| title == 'nova-conductor' |> -> Service['nova-compute']
 
 
     # deploy bits to connect nova compute to neutron
-    include ::nova::network::neutron
+    include nova::network::neutron
 
     # we need to set nova::metadata::dhcp_domain which sets
     # [api]/dhcp_domain as this is used by the virt driver
     # to generate the config drive
-    include ::nova::metadata
+    include nova::metadata
   }
 
   # If NFS is used as a Cinder or Nova backend
diff --git a/manifests/profile/base/nova/compute/ironic.pp b/manifests/profile/base/nova/compute/ironic.pp
index 52b3020f3..ee42f2a66 100644
--- a/manifests/profile/base/nova/compute/ironic.pp
+++ b/manifests/profile/base/nova/compute/ironic.pp
@@ -27,8 +27,8 @@ class tripleo::profile::base::nova::compute::ironic (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::nova::compute
-    include ::nova::compute::ironic
-    include ::nova::network::neutron
+    include tripleo::profile::base::nova::compute
+    include nova::compute::ironic
+    include nova::network::neutron
   }
 }
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index ccecaf2ea..f2feb26b9 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -27,9 +27,9 @@ class tripleo::profile::base::nova::compute::libvirt (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::nova::compute
-    include ::tripleo::profile::base::nova::migration::client
+    include tripleo::profile::base::nova::compute
+    include tripleo::profile::base::nova::migration::client
   }
-  include ::tripleo::profile::base::nova::compute_libvirt_shared
+  include tripleo::profile::base::nova::compute_libvirt_shared
 
 }
diff --git a/manifests/profile/base/nova/compute/libvirt_guests.pp b/manifests/profile/base/nova/compute/libvirt_guests.pp
index 0fefe23fc..17266119b 100644
--- a/manifests/profile/base/nova/compute/libvirt_guests.pp
+++ b/manifests/profile/base/nova/compute/libvirt_guests.pp
@@ -33,9 +33,9 @@ class tripleo::profile::base::nova::compute::libvirt_guests (
 ) {
   # only configure libvirt-guests if enabled
   if $step >= 4 and $enabled {
-    class { '::nova::compute::libvirt_guests':
+    class { 'nova::compute::libvirt_guests':
       enabled => $enabled,
     }
-    include ::nova::compute::libvirt_guests
+    include nova::compute::libvirt_guests
   }
 }
diff --git a/manifests/profile/base/nova/compute_libvirt_shared.pp b/manifests/profile/base/nova/compute_libvirt_shared.pp
index 23378112e..78903ba29 100644
--- a/manifests/profile/base/nova/compute_libvirt_shared.pp
+++ b/manifests/profile/base/nova/compute_libvirt_shared.pp
@@ -36,7 +36,7 @@ class tripleo::profile::base::nova::compute_libvirt_shared (
     $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
     $rbd_persistent_storage = hiera('rbd_persistent_storage', false)
     if $rbd_ephemeral_storage or $rbd_persistent_storage {
-      include ::nova::compute::rbd
+      include nova::compute::rbd
       exec{ "exec-setfacl-${nova_rbd_client_name}-nova":
         path    => ['/bin', '/usr/bin'],
         command => "setfacl -m u:nova:r-- /etc/ceph/ceph.client.${nova_rbd_client_name}.keyring",
@@ -50,12 +50,12 @@ class tripleo::profile::base::nova::compute_libvirt_shared (
     }
 
     if $rbd_ephemeral_storage {
-      class { '::nova::compute::libvirt':
+      class { 'nova::compute::libvirt':
         libvirt_disk_cachemodes => ['network=writeback'],
         libvirt_hw_disk_discard => 'unmap',
       }
     } else {
-      include ::nova::compute::libvirt
+      include nova::compute::libvirt
     }
   }
 }
diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp
index 93840fb37..8af7c3b42 100644
--- a/manifests/profile/base/nova/conductor.pp
+++ b/manifests/profile/base/nova/conductor.pp
@@ -31,8 +31,8 @@ class tripleo::profile::base::nova::conductor (
   $bootstrap_node                = hiera('nova_api_short_bootstrap_node_name', undef),
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::nova
-  include ::nova::db
+  include tripleo::profile::base::nova
+  include nova::db
 
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -41,9 +41,9 @@ class tripleo::profile::base::nova::conductor (
   }
 
   if $step >= 3 and $sync_db {
-    include ::nova::db::sync
+    include nova::db::sync
   }
   if $step >= 4 {
-    include ::nova::conductor
+    include nova::conductor
   }
 }
diff --git a/manifests/profile/base/nova/ec2api.pp b/manifests/profile/base/nova/ec2api.pp
index ca383fcaf..4bf3460bb 100644
--- a/manifests/profile/base/nova/ec2api.pp
+++ b/manifests/profile/base/nova/ec2api.pp
@@ -135,12 +135,12 @@ class tripleo::profile::base::nova::ec2api (
         tls_key    => $metadata_tls_keyfile,
       }
       Tripleo::Tls_proxy['ec2-api-metadata'] ~> Anchor<| title == 'ec2api::service::begin' |>
-      include ::tripleo::profile::base::apache
+      include tripleo::profile::base::apache
     }
-    include ::ec2api
-    include ::ec2api::api
-    include ::ec2api::db::sync
-    include ::ec2api::metadata
-    include ::ec2api::keystone::authtoken
+    include ec2api
+    include ec2api::api
+    include ec2api::db::sync
+    include ec2api::metadata
+    include ec2api::keystone::authtoken
   }
 }
diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp
index 0fb2be195..49decf039 100644
--- a/manifests/profile/base/nova/libvirt.pp
+++ b/manifests/profile/base/nova/libvirt.pp
@@ -36,12 +36,12 @@ class tripleo::profile::base::nova::libvirt (
   $libvirtd_config = {},
   $tls_password    = '',
 ) {
-  include ::tripleo::profile::base::nova::compute_libvirt_shared
+  include tripleo::profile::base::nova::compute_libvirt_shared
 
   if $step >= 4 {
-    include ::tripleo::profile::base::nova
-    include ::tripleo::profile::base::nova::migration::client
-    include ::nova::compute::libvirt::services
+    include tripleo::profile::base::nova
+    include tripleo::profile::base::nova::migration::client
+    include nova::compute::libvirt::services
 
     $libvirtd_config_default = {
       unix_sock_group    => {value => '"libvirt"'},
@@ -51,7 +51,7 @@ class tripleo::profile::base::nova::libvirt (
       unix_sock_rw_perms => {value => '"0770"'}
     }
 
-    class { '::nova::compute::libvirt::config':
+    class { 'nova::compute::libvirt::config':
       libvirtd_config => merge($libvirtd_config_default, $libvirtd_config)
     }
 
@@ -75,8 +75,8 @@ class tripleo::profile::base::nova::libvirt (
       before  => Service['libvirt'],
     }
 
-    include ::nova::compute::libvirt::qemu
-    include ::nova::migration::qemu
+    include nova::compute::libvirt::qemu
+    include nova::migration::qemu
 
     $libvirt_sasl_conf = "
 mech_list: scram-sha-1
diff --git a/manifests/profile/base/nova/metadata.pp b/manifests/profile/base/nova/metadata.pp
index 0199bf1e1..57cbcfcac 100644
--- a/manifests/profile/base/nova/metadata.pp
+++ b/manifests/profile/base/nova/metadata.pp
@@ -59,8 +59,8 @@ class tripleo::profile::base::nova::metadata (
     $is_bootstrap = false
   }
 
-  include ::tripleo::profile::base::nova
-  include ::tripleo::profile::base::nova::authtoken
+  include tripleo::profile::base::nova
+  include tripleo::profile::base::nova::authtoken
 
   if $enable_internal_tls {
     if !$nova_metadata_network {
@@ -74,11 +74,11 @@ class tripleo::profile::base::nova::metadata (
   }
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::nova::cors
-    include ::nova::network::neutron
-    include ::nova::metadata
-    include ::tripleo::profile::base::apache
-    class { '::nova::wsgi::apache_metadata':
+    include nova::cors
+    include nova::network::neutron
+    include nova::metadata
+    include tripleo::profile::base::apache
+    class { 'nova::wsgi::apache_metadata':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/nova/migration/client.pp b/manifests/profile/base/nova/migration/client.pp
index cc9b93230..4976631b2 100644
--- a/manifests/profile/base/nova/migration/client.pp
+++ b/manifests/profile/base/nova/migration/client.pp
@@ -51,13 +51,13 @@ class tripleo::profile::base::nova::migration::client (
   $libvirt_tls              = false,
 ) {
 
-  include ::tripleo::profile::base::nova::migration
+  include tripleo::profile::base::nova::migration
 
   if $step >= 4 {
 
     # Libvirt setup (live-migration)
     if $libvirt_tls {
-      class { '::nova::migration::libvirt':
+      class { 'nova::migration::libvirt':
         transport         => 'tls',
         configure_libvirt => $libvirt_enabled,
         configure_nova    => $nova_compute_enabled,
@@ -65,7 +65,7 @@ class tripleo::profile::base::nova::migration::client (
       }
     } else {
       # Reuse the cold-migration SSH tunnel when TLS is not enabled
-      class { '::nova::migration::libvirt':
+      class { 'nova::migration::libvirt':
         transport          => 'ssh',
         configure_libvirt  => $libvirt_enabled,
         configure_nova     => $nova_compute_enabled,
diff --git a/manifests/profile/base/nova/migration/proxy.pp b/manifests/profile/base/nova/migration/proxy.pp
index 318a1f8d6..8aa8ea894 100644
--- a/manifests/profile/base/nova/migration/proxy.pp
+++ b/manifests/profile/base/nova/migration/proxy.pp
@@ -43,11 +43,11 @@ class tripleo::profile::base::nova::migration::proxy (
   $target_port  = 22
 ) {
 
-  include ::tripleo::profile::base::nova::migration
+  include tripleo::profile::base::nova::migration
 
   if $step >= 4 {
     if !empty($ssh_private_key) {
-      class { '::tripleo::profile::base::nova::migration::target':
+      class { 'tripleo::profile::base::nova::migration::target':
         step            => $step,
         wrapper_command => "/bin/ssh \
 -p ${target_port} \
diff --git a/manifests/profile/base/nova/migration/target.pp b/manifests/profile/base/nova/migration/target.pp
index a9df5b760..f854da700 100644
--- a/manifests/profile/base/nova/migration/target.pp
+++ b/manifests/profile/base/nova/migration/target.pp
@@ -50,7 +50,7 @@ class tripleo::profile::base::nova::migration::target (
   $wrapper_command     = '/bin/nova-migration-wrapper',
 ) {
 
-  include ::tripleo::profile::base::nova::migration
+  include tripleo::profile::base::nova::migration
 
   validate_legacy(Array, 'validate_array', $ssh_localaddrs)
 
diff --git a/manifests/profile/base/nova/scheduler.pp b/manifests/profile/base/nova/scheduler.pp
index a9db318a2..0675f14e9 100644
--- a/manifests/profile/base/nova/scheduler.pp
+++ b/manifests/profile/base/nova/scheduler.pp
@@ -27,8 +27,8 @@ class tripleo::profile::base::nova::scheduler (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::nova
-    include ::nova::scheduler
-    include ::nova::scheduler::filter
+    include tripleo::profile::base::nova
+    include nova::scheduler
+    include nova::scheduler::filter
   }
 }
diff --git a/manifests/profile/base/nova/serialproxy.pp b/manifests/profile/base/nova/serialproxy.pp
index 56d75650d..93bbf96b0 100644
--- a/manifests/profile/base/nova/serialproxy.pp
+++ b/manifests/profile/base/nova/serialproxy.pp
@@ -27,7 +27,7 @@ class tripleo::profile::base::nova::serialproxy (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::nova
-    include ::nova::serialproxy
+    include tripleo::profile::base::nova
+    include nova::serialproxy
   }
 }
diff --git a/manifests/profile/base/nova/vncproxy.pp b/manifests/profile/base/nova/vncproxy.pp
index 25ab3fee1..9beacdafd 100644
--- a/manifests/profile/base/nova/vncproxy.pp
+++ b/manifests/profile/base/nova/vncproxy.pp
@@ -27,7 +27,7 @@ class tripleo::profile::base::nova::vncproxy (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
-    include ::tripleo::profile::base::nova
-    include ::nova::vncproxy
+    include tripleo::profile::base::nova
+    include nova::vncproxy
   }
 }
diff --git a/manifests/profile/base/novajoin.pp b/manifests/profile/base/novajoin.pp
index 2a2bb8c58..aa09e538d 100644
--- a/manifests/profile/base/novajoin.pp
+++ b/manifests/profile/base/novajoin.pp
@@ -67,7 +67,7 @@ class tripleo::profile::base::novajoin (
 ) {
   if $step >= 3 {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
-    class { '::nova::metadata::novajoin::api' :
+    class { 'nova::metadata::novajoin::api' :
       service_password          => $service_password,
       enable_ipa_client_install => $enable_ipa_client_install,
       transport_url             => os_transport_url({
diff --git a/manifests/profile/base/octavia.pp b/manifests/profile/base/octavia.pp
index f60fdff26..254b8d64b 100644
--- a/manifests/profile/base/octavia.pp
+++ b/manifests/profile/base/octavia.pp
@@ -57,7 +57,7 @@ class tripleo::profile::base::octavia (
 ) {
   if $step >= 3 {
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
-    class { '::octavia' :
+    class { 'octavia' :
       default_transport_url => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
@@ -67,8 +67,8 @@ class tripleo::profile::base::octavia (
         'ssl'       => $oslomsg_rpc_use_ssl_real,
         }),
     }
-    include ::octavia::config
-    include ::octavia::logging
-    include ::octavia::service_auth
+    include octavia::config
+    include octavia::logging
+    include octavia::service_auth
   }
 }
diff --git a/manifests/profile/base/octavia/api.pp b/manifests/profile/base/octavia/api.pp
index f7c7b7fe7..c4964cc59 100644
--- a/manifests/profile/base/octavia/api.pp
+++ b/manifests/profile/base/octavia/api.pp
@@ -79,8 +79,8 @@ class tripleo::profile::base::octavia::api (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::octavia
-  include ::tripleo::profile::base::octavia::authtoken
+  include tripleo::profile::base::octavia
+  include tripleo::profile::base::octavia::authtoken
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
     if $enable_internal_tls {
@@ -98,16 +98,16 @@ class tripleo::profile::base::octavia::api (
   # it will try to populate tables and we need to make sure this happens
   # before it starts on other nodes
   if ($step >= 4 and $sync_db) or ($step >= 5 and !$sync_db) {
-    include ::octavia::controller
+    include octavia::controller
     if $ovn_db_host and $ovn_nb_port {
       $ovn_nb_connection = join(['tcp', normalize_ip_for_uri($ovn_db_host), "${ovn_nb_port}"], ':')
     }
-    class { '::octavia::api':
+    class { 'octavia::api':
       sync_db           => $sync_db,
       ovn_nb_connection => $ovn_nb_connection,
     }
-    include ::tripleo::profile::base::apache
-    class { '::octavia::wsgi::apache':
+    include tripleo::profile::base::apache
+    class { 'octavia::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile
     }
diff --git a/manifests/profile/base/octavia/authtoken.pp b/manifests/profile/base/octavia/authtoken.pp
index e7ec876cb..630ea43e4 100644
--- a/manifests/profile/base/octavia/authtoken.pp
+++ b/manifests/profile/base/octavia/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::octavia::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::octavia::keystone::authtoken':
+    class { 'octavia::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/octavia/health_manager.pp b/manifests/profile/base/octavia/health_manager.pp
index ed6a0506b..020fa12be 100644
--- a/manifests/profile/base/octavia/health_manager.pp
+++ b/manifests/profile/base/octavia/health_manager.pp
@@ -26,10 +26,10 @@
 class tripleo::profile::base::octavia::health_manager (
   $step           = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::octavia
+  include tripleo::profile::base::octavia
   if $step >= 5 {
-    include ::octavia::controller
-    include ::octavia::health_manager
-    include ::octavia::certificates
+    include octavia::controller
+    include octavia::health_manager
+    include octavia::certificates
   }
 }
diff --git a/manifests/profile/base/octavia/housekeeping.pp b/manifests/profile/base/octavia/housekeeping.pp
index 26668b46e..36abf1e83 100644
--- a/manifests/profile/base/octavia/housekeeping.pp
+++ b/manifests/profile/base/octavia/housekeeping.pp
@@ -26,10 +26,10 @@
 class tripleo::profile::base::octavia::housekeeping (
   $step           = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::octavia
+  include tripleo::profile::base::octavia
 
   if $step >= 5 {
-    include ::octavia::controller
-    include ::octavia::housekeeping
+    include octavia::controller
+    include octavia::housekeeping
   }
 }
diff --git a/manifests/profile/base/octavia/worker.pp b/manifests/profile/base/octavia/worker.pp
index 6571373da..22a0d238f 100644
--- a/manifests/profile/base/octavia/worker.pp
+++ b/manifests/profile/base/octavia/worker.pp
@@ -26,11 +26,11 @@
 class tripleo::profile::base::octavia::worker (
   $step           = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::octavia
+  include tripleo::profile::base::octavia
 
   if $step >= 5 {
-    include ::octavia::controller
-    include ::octavia::worker
-    include ::octavia::certificates
+    include octavia::controller
+    include octavia::worker
+    include octavia::certificates
   }
 }
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index bb6f2a855..324db3b02 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -114,7 +114,7 @@ class tripleo::profile::base::pacemaker (
   }
 
   if $pcs_password == undef {
-    fail('The $pcs_password param is undefined, did you forget to include ::tripleo::profile::base::pacemaker in your role?')
+    fail('The $pcs_password param is undefined, did you forget to include tripleo::profile::base::pacemaker in your role?')
   }
 
   Pcmk_resource <| |> {
@@ -163,10 +163,10 @@ class tripleo::profile::base::pacemaker (
     } else {
       $cluster_setup_extras = $cluster_setup_extras_pre
     }
-    class { '::pacemaker':
+    class { 'pacemaker':
       hacluster_pwd => $pcs_password,
     }
-    -> class { '::pacemaker::corosync':
+    -> class { 'pacemaker::corosync':
       cluster_members      => $pacemaker_cluster_members,
       setup_cluster        => $pacemaker_master,
       cluster_setup_extras => $cluster_setup_extras,
@@ -175,7 +175,7 @@ class tripleo::profile::base::pacemaker (
       tls_priorities       => $tls_priorities,
     }
     if str2bool(hiera('docker_enabled', false)) {
-      include ::systemd::systemctl::daemon_reload
+      include systemd::systemctl::daemon_reload
 
       Package<| name == 'docker' |>
       -> file { '/etc/systemd/system/resource-agents-deps.target.wants':
@@ -195,14 +195,14 @@ class tripleo::profile::base::pacemaker (
     }
 
     if $pacemaker_master {
-      class { '::pacemaker::stonith':
+      class { 'pacemaker::stonith':
         disable => !$enable_fencing,
         tries   => $pcs_tries,
       }
       Class['pacemaker::stonith'] -> Exec<|tag == 'pacemaker-scaleup'|>
     }
     if $enable_fencing {
-      include ::tripleo::fencing
+      include tripleo::fencing
 
       # enable stonith after all Pacemaker resources have been created
       Pcmk_resource<||> -> Class['tripleo::fencing']
@@ -245,16 +245,16 @@ class tripleo::profile::base::pacemaker (
   }
 
   if $enable_instanceha and $pacemaker_master {
-    include ::tripleo::profile::base::pacemaker::instance_ha
+    include tripleo::profile::base::pacemaker::instance_ha
   }
 
   if ($step >= 2 and $pacemaker_master) {
     if ! $enable_instanceha {
-      include ::pacemaker::resource_defaults
+      include pacemaker::resource_defaults
     }
     # Set pacemaker resource op defaults only when specified
     if $resource_op_defaults != undef {
-      class { '::pacemaker::resource_op_defaults':
+      class { 'pacemaker::resource_op_defaults':
         tries    => $pcs_tries,
         defaults => $resource_op_defaults,
       }
diff --git a/manifests/profile/base/pacemaker/instance_ha.pp b/manifests/profile/base/pacemaker/instance_ha.pp
index 908c0660c..8a0e4903b 100644
--- a/manifests/profile/base/pacemaker/instance_ha.pp
+++ b/manifests/profile/base/pacemaker/instance_ha.pp
@@ -95,7 +95,7 @@ class tripleo::profile::base::pacemaker::instance_ha (
   $deep_compare_ocf      = hiera('pacemaker::resource::ocf::deep_compare', true),
 ) {
   if $step >= 2 {
-    class { '::pacemaker::resource_defaults':
+    class { 'pacemaker::resource_defaults':
       tries    => $pcs_tries,
       defaults => {
         'fencing-default' => {
diff --git a/manifests/profile/base/pacemaker_remote.pp b/manifests/profile/base/pacemaker_remote.pp
index 63e30bb02..5feafb7d9 100644
--- a/manifests/profile/base/pacemaker_remote.pp
+++ b/manifests/profile/base/pacemaker_remote.pp
@@ -61,7 +61,7 @@ class tripleo::profile::base::pacemaker_remote (
   if $pcs_password == undef {
     fail('The $pcs_password param is and the hiera key "hacluster_pwd" hiera key are both undefined, this is not allowed')
   }
-  class { '::pacemaker::remote':
+  class { 'pacemaker::remote':
     pcs_user       => $pcs_user,
     pcs_password   => $pcs_password,
     remote_authkey => $remote_authkey,
@@ -69,7 +69,7 @@ class tripleo::profile::base::pacemaker_remote (
     tls_priorities => $tls_priorities,
   }
   if str2bool(hiera('docker_enabled', false)) {
-    include ::systemd::systemctl::daemon_reload
+    include systemd::systemctl::daemon_reload
 
     Package<| name == 'docker' |>
     -> file { '/etc/systemd/system/resource-agents-deps.target.wants':
@@ -90,7 +90,7 @@ class tripleo::profile::base::pacemaker_remote (
   $enable_fencing_real = str2bool($enable_fencing) and $step >= 5
 
   if $enable_fencing_real {
-    include ::tripleo::fencing
+    include tripleo::fencing
 
     # enable stonith after all Pacemaker resources have been created
     Pcmk_resource<||> -> Class['tripleo::fencing']
diff --git a/manifests/profile/base/panko.pp b/manifests/profile/base/panko.pp
index f221fdec1..1907f96ee 100644
--- a/manifests/profile/base/panko.pp
+++ b/manifests/profile/base/panko.pp
@@ -28,8 +28,8 @@ class tripleo::profile::base::panko (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 3 {
-    include ::panko
-    include ::panko::config
-    include ::panko::logging
+    include panko
+    include panko::config
+    include panko::logging
   }
 }
diff --git a/manifests/profile/base/panko/api.pp b/manifests/profile/base/panko/api.pp
index 46668362f..369f8b6e4 100644
--- a/manifests/profile/base/panko/api.pp
+++ b/manifests/profile/base/panko/api.pp
@@ -66,8 +66,8 @@ class tripleo::profile::base::panko::api (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::panko
-  include ::tripleo::profile::base::panko::authtoken
+  include tripleo::profile::base::panko
+  include tripleo::profile::base::panko::authtoken
 
   if $enable_internal_tls {
     if !$panko_network {
@@ -81,15 +81,15 @@ class tripleo::profile::base::panko::api (
   }
 
   if $step >= 4  or ( $step >= 3 and $sync_db ) {
-    include ::panko::db
-    class { '::panko::api':
+    include panko::db
+    class { 'panko::api':
       sync_db => $sync_db,
     }
     if $enable_panko_expirer {
-      include ::panko::expirer
+      include panko::expirer
     }
-    include ::tripleo::profile::base::apache
-    class { '::panko::wsgi::apache':
+    include tripleo::profile::base::apache
+    class { 'panko::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/panko/authtoken.pp b/manifests/profile/base/panko/authtoken.pp
index 4b9ce6f74..0d0352550 100644
--- a/manifests/profile/base/panko/authtoken.pp
+++ b/manifests/profile/base/panko/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::panko::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::panko::keystone::authtoken':
+    class { 'panko::keystone::authtoken':
       memcached_servers => $memcache_servers
     }
   }
diff --git a/manifests/profile/base/placement.pp b/manifests/profile/base/placement.pp
index c7d790281..b3328acfd 100644
--- a/manifests/profile/base/placement.pp
+++ b/manifests/profile/base/placement.pp
@@ -38,9 +38,9 @@ class tripleo::profile::base::placement (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::placement
-    include ::placement::config
-    include ::placement::logging
-    include ::placement::db
+    include placement
+    include placement::config
+    include placement::logging
+    include placement::db
   }
 }
diff --git a/manifests/profile/base/placement/api.pp b/manifests/profile/base/placement/api.pp
index 33b7cd3e7..8b35be97b 100644
--- a/manifests/profile/base/placement/api.pp
+++ b/manifests/profile/base/placement/api.pp
@@ -59,8 +59,8 @@ class tripleo::profile::base::placement::api (
     $is_bootstrap = false
   }
 
-  include ::tripleo::profile::base::placement
-  include ::tripleo::profile::base::placement::authtoken
+  include tripleo::profile::base::placement
+  include tripleo::profile::base::placement::authtoken
 
   if $enable_internal_tls {
     if !$placement_network {
@@ -74,8 +74,8 @@ class tripleo::profile::base::placement::api (
   }
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::tripleo::profile::base::apache
-    class { '::placement::wsgi::apache':
+    include tripleo::profile::base::apache
+    class { 'placement::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/base/placement/authtoken.pp b/manifests/profile/base/placement/authtoken.pp
index 969105a0d..fa755058c 100644
--- a/manifests/profile/base/placement/authtoken.pp
+++ b/manifests/profile/base/placement/authtoken.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::placement::authtoken (
       $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
     }
 
-    class { '::placement::keystone::authtoken':
+    class { 'placement::keystone::authtoken':
       memcached_servers => $memcache_servers,
     }
   }
diff --git a/manifests/profile/base/qdr.pp b/manifests/profile/base/qdr.pp
index 457444a6f..67a8fa99f 100644
--- a/manifests/profile/base/qdr.pp
+++ b/manifests/profile/base/qdr.pp
@@ -105,7 +105,7 @@ class tripleo::profile::base::qdr (
                         {'prefix'       => 'openstack.org/om/notify/anycast',
                         'distribution' => 'balanced'}]
 
-    class { '::qdr':
+    class { 'qdr':
       listener_addr   => '0.0.0.0',
       listener_port   => "${qdr_listener_port}",
       router_mode     => $router_mode,
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index 2e2925d2c..470ae165e 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -185,7 +185,7 @@ class tripleo::profile::base::rabbitmq (
   if $step >= 1 {
     # Specific configuration for multi-nodes or when running with Pacemaker.
     if count($nodes) > 1 or ! $manage_service {
-      class { '::rabbitmq':
+      class { 'rabbitmq':
         config_cluster          => $manage_service,
         cluster_nodes           => $nodes,
         config_kernel_variables => $real_kernel_variables,
@@ -209,7 +209,7 @@ class tripleo::profile::base::rabbitmq (
       }
     } else {
       # Standard configuration
-      class { '::rabbitmq':
+      class { 'rabbitmq':
         config_kernel_variables => $kernel_variables,
         config_variables        => $config_variables,
         environment_variables   => $environment,
@@ -245,7 +245,7 @@ class tripleo::profile::base::rabbitmq (
       }
     }
     if hiera('veritas_hyperscale_controller_enabled', false) {
-      include ::veritas_hyperscale::hs_rabbitmq
+      include veritas_hyperscale::hs_rabbitmq
     }
   }
 
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index f01824d17..23ef9f7fa 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.pp
@@ -99,7 +99,7 @@ class tripleo::profile::base::sahara (
   if $step >= 4 or ($step >= 3 and $sync_db){
     $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { '::sahara':
+    class { 'sahara':
       sync_db               => $sync_db,
       default_transport_url => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
@@ -110,7 +110,7 @@ class tripleo::profile::base::sahara (
         'ssl'       => $oslomsg_rpc_use_ssl_real,
       }),
     }
-    class { '::sahara::notify':
+    class { 'sahara::notify':
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
@@ -120,8 +120,8 @@ class tripleo::profile::base::sahara (
         'ssl'       => $oslomsg_notify_use_ssl_real,
       }),
     }
-    include ::sahara::keystone::authtoken
-    include ::sahara::config
-    include ::sahara::logging
+    include sahara::keystone::authtoken
+    include sahara::config
+    include sahara::logging
   }
 }
diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp
index 83f195667..52381f93b 100644
--- a/manifests/profile/base/sahara/api.pp
+++ b/manifests/profile/base/sahara/api.pp
@@ -26,9 +26,9 @@
 class tripleo::profile::base::sahara::api (
   $step = Integer(hiera('step')),
 ) {
-  include ::tripleo::profile::base::sahara
+  include tripleo::profile::base::sahara
 
   if $step >= 4 {
-    include ::sahara::service::api
+    include sahara::service::api
   }
 }
diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp
index 6d131b144..9ac541f20 100644
--- a/manifests/profile/base/sahara/engine.pp
+++ b/manifests/profile/base/sahara/engine.pp
@@ -37,9 +37,9 @@ class tripleo::profile::base::sahara::engine (
     $sync_db = false
   }
 
-  include ::tripleo::profile::base::sahara
+  include tripleo::profile::base::sahara
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::sahara::service::engine
+    include sahara::service::engine
   }
 }
diff --git a/manifests/profile/base/snmp.pp b/manifests/profile/base/snmp.pp
index eaeeebe58..e76af9213 100644
--- a/manifests/profile/base/snmp.pp
+++ b/manifests/profile/base/snmp.pp
@@ -58,11 +58,11 @@ class tripleo::profile::base::snmp (
     }
     if $snmpd_config {
       validate_legacy(Array, 'validate_array', $snmpd_config)
-      class { '::snmp':
+      class { 'snmp':
         snmpd_config => $snmpd_config,
       }
     } else {
-      class { '::snmp':
+      class { 'snmp':
         snmpd_config => [ join(['createUser ', $snmpd_user, ' MD5 "', $snmpd_password, '"']),
                           join(['rouser ', $snmpd_user]),
                           'proc  cron',
diff --git a/manifests/profile/base/sshd.pp b/manifests/profile/base/sshd.pp
index 4f41ba486..3fac968c1 100644
--- a/manifests/profile/base/sshd.pp
+++ b/manifests/profile/base/sshd.pp
@@ -111,7 +111,7 @@ class tripleo::profile::base::sshd (
   if hiera('ssh:server::options', undef) {
     err('ssh:server::options must not be set, use tripleo::profile::base::sshd::options')
   }
-  class { '::ssh::server':
+  class { 'ssh::server':
     storeconfigs_enabled => false,
     options              => $sshd_options
   }
diff --git a/manifests/profile/base/swift/dispersion.pp b/manifests/profile/base/swift/dispersion.pp
index 44af46311..de0fd7bf3 100644
--- a/manifests/profile/base/swift/dispersion.pp
+++ b/manifests/profile/base/swift/dispersion.pp
@@ -27,7 +27,7 @@ class tripleo::profile::base::swift::dispersion (
   $step = Integer(hiera('step')),
 ) {
   if $step >= 5 {
-    include ::swift::client
-    include ::swift::dispersion
+    include swift::client
+    include swift::dispersion
   }
 }
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index c07a0ce26..f4ee3f62f 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -139,30 +139,30 @@ class tripleo::profile::base::swift::proxy (
         tls_key    => $tls_keyfile,
       }
       Tripleo::Tls_proxy['swift-proxy-api'] ~> Anchor<| title == 'swift::service::begin' |>
-      include ::tripleo::profile::base::apache
+      include tripleo::profile::base::apache
     }
   }
   if $step >= 4 {
     $swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
-    include ::swift
-    include ::swift::config
-    include ::swift::proxy
-    include ::swift::proxy::proxy_logging
-    include ::swift::proxy::healthcheck
-    class { '::swift::proxy::cache':
+    include swift
+    include swift::config
+    include swift::proxy
+    include swift::proxy::proxy_logging
+    include swift::proxy::healthcheck
+    class { 'swift::proxy::cache':
       memcache_servers => $swift_memcache_servers
     }
-    include ::swift::proxy::keystone
-    include ::swift::proxy::authtoken
-    include ::swift::proxy::staticweb
-    include ::swift::proxy::ratelimit
-    include ::swift::proxy::catch_errors
-    include ::swift::proxy::tempurl
-    include ::swift::proxy::formpost
-    include ::swift::proxy::bulk
+    include swift::proxy::keystone
+    include swift::proxy::authtoken
+    include swift::proxy::staticweb
+    include swift::proxy::ratelimit
+    include swift::proxy::catch_errors
+    include swift::proxy::tempurl
+    include swift::proxy::formpost
+    include swift::proxy::bulk
     if $ceilometer_enabled {
       $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
-      class { '::swift::proxy::ceilometer':
+      class { 'swift::proxy::ceilometer':
         default_transport_url      => os_transport_url({
           'transport' => $oslomsg_rpc_proto,
           'hosts'     => $oslomsg_rpc_hosts,
@@ -173,19 +173,19 @@ class tripleo::profile::base::swift::proxy (
         }),
       }
     }
-    include ::swift::proxy::versioned_writes
-    include ::swift::proxy::slo
-    include ::swift::proxy::dlo
-    include ::swift::proxy::copy
-    include ::swift::proxy::container_quotas
-    include ::swift::proxy::account_quotas
-    include ::swift::proxy::encryption
-    include ::swift::proxy::kms_keymaster
-    include ::swift::keymaster
-    include ::swift::proxy::s3api
-    include ::swift::proxy::s3token
+    include swift::proxy::versioned_writes
+    include swift::proxy::slo
+    include swift::proxy::dlo
+    include swift::proxy::copy
+    include swift::proxy::container_quotas
+    include swift::proxy::account_quotas
+    include swift::proxy::encryption
+    include swift::proxy::kms_keymaster
+    include swift::keymaster
+    include swift::proxy::s3api
+    include swift::proxy::s3token
 
-    class { '::swift::objectexpirer':
+    class { 'swift::objectexpirer':
       pipeline         => ['catch_errors', 'cache', 'proxy-server'],
       memcache_servers => $swift_memcache_servers
     }
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 5e7b226f0..1903c0034 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -106,7 +106,7 @@ class tripleo::profile::base::swift::ringbuilder (
 
   if $step >= 2 {
     # pre-install swift here so we can build rings
-    include ::swift
+    include swift
   }
 
   if $step >= 3 {
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 6eeb49c35..04b6ba11c 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -44,11 +44,11 @@ class tripleo::profile::base::swift::storage (
 ) {
   if $step >= 4 {
     if $enable_swift_storage {
-      include ::swift
-      include ::swift::config
-      include ::swift::storage::disks
-      include ::swift::storage::loopbacks
-      include ::swift::storage::all
+      include swift
+      include swift::config
+      include swift::storage::disks
+      include swift::storage::loopbacks
+      include swift::storage::all
       if(!defined(File['/srv/node'])) {
         file { '/srv/node':
           ensure  => directory,
diff --git a/manifests/profile/base/trove/api.pp b/manifests/profile/base/trove/api.pp
index 660b261b1..31e65efe9 100644
--- a/manifests/profile/base/trove/api.pp
+++ b/manifests/profile/base/trove/api.pp
@@ -38,9 +38,9 @@ class tripleo::profile::base::trove::api (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::trove
-    include ::trove::config
-    include ::trove::api
+    include trove
+    include trove::config
+    include trove::api
   }
 
 }
diff --git a/manifests/profile/base/trove/conductor.pp b/manifests/profile/base/trove/conductor.pp
index cc6f03938..cc4b410c8 100644
--- a/manifests/profile/base/trove/conductor.pp
+++ b/manifests/profile/base/trove/conductor.pp
@@ -28,9 +28,9 @@ class tripleo::profile::base::trove::conductor (
 ) {
 
   if $step >= 4 {
-    include ::trove
-    include ::trove::config
-    include ::trove::conductor
+    include trove
+    include trove::config
+    include trove::conductor
   }
 
 }
diff --git a/manifests/profile/base/trove/taskmanager.pp b/manifests/profile/base/trove/taskmanager.pp
index 7fc2a8128..72a8614d2 100644
--- a/manifests/profile/base/trove/taskmanager.pp
+++ b/manifests/profile/base/trove/taskmanager.pp
@@ -28,9 +28,9 @@ class tripleo::profile::base::trove::taskmanager (
 ) {
 
   if $step >= 4 {
-    include ::trove
-    include ::trove::config
-    include ::trove::taskmanager
+    include trove
+    include trove::config
+    include trove::taskmanager
   }
 
 }
diff --git a/manifests/profile/base/vpp.pp b/manifests/profile/base/vpp.pp
index 90bc54e4f..795030d16 100644
--- a/manifests/profile/base/vpp.pp
+++ b/manifests/profile/base/vpp.pp
@@ -27,6 +27,6 @@ class tripleo::profile::base::vpp (
   $step        = Integer(hiera('step')),
 ) {
   if $step >= 1 {
-    include ::fdio
+    include fdio
   }
 }
diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp
index eac8274c5..2a4d94ea4 100644
--- a/manifests/profile/base/zaqar.pp
+++ b/manifests/profile/base/zaqar.pp
@@ -93,10 +93,10 @@ class tripleo::profile::base::zaqar (
   }
 
   if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::zaqar
+    include zaqar
 
     if $messaging_store == 'swift' {
-      include ::zaqar::messaging::swift
+      include zaqar::messaging::swift
     } elsif $messaging_store == 'redis' {
       class {'::zaqar::messaging::redis':
         uri => join(['redis://:', $zaqar_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']),
@@ -106,21 +106,21 @@ class tripleo::profile::base::zaqar (
     }
 
     if $management_store == 'sqlalchemy' {
-      include ::zaqar::management::sqlalchemy
+      include zaqar::management::sqlalchemy
     } else {
       fail("unsupported Zaqar management_store set: ${management_store}")
     }
 
-    include ::zaqar::transport::websocket
-    include ::tripleo::profile::base::apache
-    include ::zaqar::transport::wsgi
-    include ::zaqar::config
-    include ::zaqar::logging
+    include zaqar::transport::websocket
+    include tripleo::profile::base::apache
+    include zaqar::transport::wsgi
+    include zaqar::config
+    include zaqar::logging
 
     # TODO (bcrochet): At some point, the transports should be split out to
     # separate services.
-    include ::zaqar::server
-    class { '::zaqar::wsgi::apache':
+    include zaqar::server
+    class { 'zaqar::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp
index 17ed95d06..8b31cd8d3 100644
--- a/manifests/profile/pacemaker/cinder/backup.pp
+++ b/manifests/profile/pacemaker/cinder/backup.pp
@@ -50,7 +50,7 @@ class tripleo::profile::pacemaker::cinder::backup (
     $pacemaker_master = false
   }
 
-  include ::tripleo::profile::base::cinder::backup
+  include tripleo::profile::base::cinder::backup
 
   if $step >= 2 {
     pacemaker::property { 'cinder-backup-role-node-property':
diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index 90334732d..a9694f332 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@@ -82,7 +82,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
     $log_driver_real = $log_driver
   }
 
-  include ::tripleo::profile::base::cinder::backup
+  include tripleo::profile::base::cinder::backup
 
   if $step >= 2 and $pacemaker_master {
     $cinder_backup_short_node_names = hiera('cinder_backup_short_node_names')
diff --git a/manifests/profile/pacemaker/cinder/volume.pp b/manifests/profile/pacemaker/cinder/volume.pp
index e9934261a..7e2af87bb 100644
--- a/manifests/profile/pacemaker/cinder/volume.pp
+++ b/manifests/profile/pacemaker/cinder/volume.pp
@@ -49,7 +49,7 @@ class tripleo::profile::pacemaker::cinder::volume (
     $pacemaker_master = false
   }
 
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 2 {
     pacemaker::property { 'cinder-volume-role-node-property':
diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp
index ec266c533..07ebbcf25 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@@ -82,7 +82,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
   } else {
     $log_driver_real = $log_driver
   }
-  include ::tripleo::profile::base::cinder::volume
+  include tripleo::profile::base::cinder::volume
 
   if $step >= 2 and $pacemaker_master {
     $cinder_volume_short_node_names = hiera('cinder_volume_short_node_names')
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index faa037fb5..120a2d1ef 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -223,7 +223,7 @@ class tripleo::profile::pacemaker::database::mysql (
     $remove_default_accounts = false
   }
 
-  class { '::tripleo::profile::base::database::mysql':
+  class { 'tripleo::profile::base::database::mysql':
     bootstrap_node          => $bootstrap_node,
     manage_resources        => false,
     remove_default_accounts => $remove_default_accounts,
diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp
index a56c0be49..e64a67154 100644
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/manifests/profile/pacemaker/database/mysql_bundle.pp
@@ -320,7 +320,7 @@ MYSQL_HOST=localhost\n",
     # need that class to create all openstack credentials
     # we don't include it in step 1 because the kolla bootstrap
     # happens after step 1 baremetal
-    class { '::tripleo::profile::base::database::mysql':
+    class { 'tripleo::profile::base::database::mysql':
       bootstrap_node          => $bootstrap_node,
       manage_resources        => false,
       remove_default_accounts => $remove_default_accounts,
diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp
index f3aa3c388..e95716580 100644
--- a/manifests/profile/pacemaker/database/redis.pp
+++ b/manifests/profile/pacemaker/database/redis.pp
@@ -144,7 +144,7 @@ class tripleo::profile::pacemaker::database::redis (
       $tls_certfile = $certificate_specs['service_certificate']
       $tls_keyfile = $certificate_specs['service_key']
 
-      include ::tripleo::stunnel
+      include tripleo::stunnel
 
       # encrypted endpoint for incoming redis service
       ::tripleo::stunnel::service_proxy { 'redis':
@@ -200,11 +200,11 @@ slave-announce-port ${local_tuple[0][2]}
     $old_redis_file_limit = hiera('redis_file_limit', undef)
     if $old_redis_file_limit != undef {
       warning('redis_file_limit parameter is deprecated, use redis::ulimit in hiera.')
-      class { '::redis':
+      class { 'redis':
         ulimit => $old_redis_file_limit,
       }
     } else {
-      include ::redis
+      include redis
     }
     if $pacemaker_master and hiera('stack_action') == 'UPDATE' {
       tripleo::pacemaker::resource_restart_flag { 'redis-master':
diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp
index 693d185df..3287d5cca 100644
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@@ -165,7 +165,7 @@ class tripleo::profile::pacemaker::database::redis_bundle (
       $tls_certfile = $certificate_specs['service_certificate']
       $tls_keyfile = $certificate_specs['service_key']
 
-      include ::tripleo::stunnel
+      include tripleo::stunnel
 
       # encrypted endpoint for incoming redis service
       ::tripleo::stunnel::service_proxy { 'redis':
@@ -224,11 +224,11 @@ slave-announce-port ${local_tuple[0][2]}
     $old_redis_file_limit = hiera('redis_file_limit', undef)
     if $old_redis_file_limit != undef {
       warning('redis_file_limit parameter is deprecated, use redis::ulimit in hiera.')
-      class { '::redis':
+      class { 'redis':
         ulimit => $old_redis_file_limit,
       }
     } else {
-      include ::redis
+      include redis
     }
   }
 
diff --git a/manifests/profile/pacemaker/haproxy_bundle.pp b/manifests/profile/pacemaker/haproxy_bundle.pp
index 75ecbe958..11b009274 100644
--- a/manifests/profile/pacemaker/haproxy_bundle.pp
+++ b/manifests/profile/pacemaker/haproxy_bundle.pp
@@ -107,7 +107,7 @@ class tripleo::profile::pacemaker::haproxy_bundle (
   $step                     = Integer(hiera('step')),
   $pcs_tries                = hiera('pcs_tries', 20),
 ) {
-  include ::tripleo::profile::base::haproxy
+  include tripleo::profile::base::haproxy
 
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp
index 11fa5507e..134b4969f 100644
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@ -51,7 +51,7 @@ class tripleo::profile::pacemaker::manila (
     stop       => '/bin/true',
   }
 
-  include ::tripleo::profile::base::manila::share
+  include tripleo::profile::base::manila::share
 
   if $step >= 2 {
     pacemaker::property { 'manila-share-role-node-property':
diff --git a/manifests/profile/pacemaker/manila/share_bundle.pp b/manifests/profile/pacemaker/manila/share_bundle.pp
index 1295ecbef..f84cedb81 100644
--- a/manifests/profile/pacemaker/manila/share_bundle.pp
+++ b/manifests/profile/pacemaker/manila/share_bundle.pp
@@ -87,7 +87,7 @@ class tripleo::profile::pacemaker::manila::share_bundle (
   } else {
     $log_driver_real = $log_driver
   }
-  include ::tripleo::profile::base::manila::share
+  include tripleo::profile::base::manila::share
 
   if $step >= 2 and $pacemaker_master {
     $manila_share_short_node_names = hiera('manila_share_short_node_names')
diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp
index 1881e580d..3a367b05a 100644
--- a/manifests/profile/pacemaker/rabbitmq.pp
+++ b/manifests/profile/pacemaker/rabbitmq.pp
@@ -92,7 +92,7 @@ class tripleo::profile::pacemaker::rabbitmq (
     $pacemaker_master = false
   }
 
-  include ::tripleo::profile::base::rabbitmq
+  include tripleo::profile::base::rabbitmq
 
   file { '/var/lib/rabbitmq/.erlang.cookie':
     ensure  => file,
@@ -118,7 +118,7 @@ class tripleo::profile::pacemaker::rabbitmq (
       node     => $::hostname,
     }
     if $pacemaker_master {
-      include ::stdlib
+      include stdlib
       # The default nr of ha queues is ceiling(N/2)
       if $user_ha_queues == 0 {
         $nr_rabbit_nodes = size($rabbit_nodes)
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index 3ec0fc2d2..d1511329e 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -146,7 +146,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
   } else {
     $log_driver_real = $log_driver
   }
-  include ::tripleo::profile::base::rabbitmq
+  include tripleo::profile::base::rabbitmq
 
   file { '/var/lib/rabbitmq/.erlang.cookie':
     ensure  => file,
diff --git a/manifests/stunnel.pp b/manifests/stunnel.pp
index b2c56ec1d..7628b52c0 100644
--- a/manifests/stunnel.pp
+++ b/manifests/stunnel.pp
@@ -56,7 +56,7 @@ class tripleo::stunnel (
   if $manage_service {
     Concat['/etc/stunnel/stunnel.conf'] ~> Service['stunnel']
 
-    include ::tripleo::stunnel::systemd_unit
+    include tripleo::stunnel::systemd_unit
 
     service { 'stunnel':
       ensure => $service_ensure
diff --git a/manifests/tls_proxy.pp b/manifests/tls_proxy.pp
index e57ef211b..876c38f79 100644
--- a/manifests/tls_proxy.pp
+++ b/manifests/tls_proxy.pp
@@ -51,7 +51,7 @@ define tripleo::tls_proxy(
   $preserve_host = false,
   $proxy_pass_host = hiera('localhost_address', 'localhost')
 ) {
-  include ::apache
+  include apache
   ::apache::vhost { "${title}-proxy":
     ensure              => 'present',
     docroot             => false,  # This is required by the manifest
diff --git a/spec/classes/tripleo_certmonger_ca_local_spec.rb b/spec/classes/tripleo_certmonger_ca_local_spec.rb
index 3d4d1e1bd..b8f0781ea 100644
--- a/spec/classes/tripleo_certmonger_ca_local_spec.rb
+++ b/spec/classes/tripleo_certmonger_ca_local_spec.rb
@@ -23,7 +23,7 @@ describe 'tripleo::certmonger::ca::local' do
   shared_examples_for 'tripleo::certmonger::ca::local' do
 
     let :pre_condition do
-      "include ::certmonger"
+      "include certmonger"
     end
 
     let :params do
diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index 7802f0534..3ba1017b7 100644
--- a/spec/classes/tripleo_profile_base_aodh_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
@@ -24,7 +24,7 @@ describe 'tripleo::profile::base::aodh::api' do
 
   shared_examples_for 'tripleo::profile::base::aodh::api' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
+      "class { 'tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
     end
 
     context 'with step less than 3' do
diff --git a/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb b/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
index ce8869ea9..1951516be 100644
--- a/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 describe 'tripleo::profile::base::aodh::evaluator' do
   shared_examples_for 'tripleo::profile::base::aodh::evaluator' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
+      "class { 'tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
     end
 
     context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_aodh_listener_spec.rb b/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
index 47f363e0c..035c4ac64 100644
--- a/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 describe 'tripleo::profile::base::aodh::listener' do
   shared_examples_for 'tripleo::profile::base::aodh::listener' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
+      "class { 'tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
     end
 
     context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb b/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
index 6c16615ca..d33a08b99 100644
--- a/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 describe 'tripleo::profile::base::aodh::notifier' do
   shared_examples_for 'tripleo::profile::base::aodh::notifier' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
+      "class { 'tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
     end
 
     context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_barbican_api_spec.rb b/spec/classes/tripleo_profile_base_barbican_api_spec.rb
index 89bbb2743..23ea00579 100644
--- a/spec/classes/tripleo_profile_base_barbican_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_barbican_api_spec.rb
@@ -23,7 +23,7 @@ describe 'tripleo::profile::base::barbican::api' do
     end
 
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::barbican': step => #{params[:step]} }"
+      "class { 'tripleo::profile::base::barbican': step => #{params[:step]} }"
     end
 
     context 'with step less than 3' do
diff --git a/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb
index 38c94c6fe..c5e286521 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb
@@ -23,7 +23,7 @@ describe 'tripleo::profile::base::ceilometer::agent::polling' do
     end
 
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
+      "class { 'tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
     end
 
     context 'with step less than 4' do
@@ -38,7 +38,7 @@ describe 'tripleo::profile::base::ceilometer::agent::polling' do
     context 'with step 4 on polling agent' do
 
       let(:pre_condition) do
-        "class { '::ceilometer::agent::auth': auth_password => 'password' }"
+        "class { 'ceilometer::agent::auth': auth_password => 'password' }"
       end
 
       let(:params) { {
diff --git a/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb
index 65f88f625..dda17ad3a 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 describe 'tripleo::profile::base::ceilometer::expirer' do
   shared_examples_for 'tripleo::profile::base::ceilometer::expirer' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
+      "class { 'tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
     end
 
     context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_cinder_api_spec.rb b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
index e8574a916..fc7d5e5b1 100644
--- a/spec/classes/tripleo_profile_base_cinder_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
@@ -23,7 +23,7 @@ describe 'tripleo::profile::base::cinder::api' do
     end
 
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
+      "class { 'tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
     end
 
     context 'with step less than 3' do
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
index 2f90692f5..574eeee13 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
@@ -20,8 +20,8 @@ describe 'tripleo::profile::base::cinder::backup::ceph' do
   shared_examples_for 'tripleo::profile::base::cinder::backup::ceph' do
     let(:pre_condition) do
       <<-EOF
-      class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
-      class { '::tripleo::profile::base::cinder::backup': step => #{params[:step]} }
+      class { 'tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
+      class { 'tripleo::profile::base::cinder::backup': step => #{params[:step]} }
       EOF
     end
 
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb
index 6fc95fa3b..9fbb7e4be 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb
@@ -20,8 +20,8 @@ describe 'tripleo::profile::base::cinder::backup::nfs' do
   shared_examples_for 'tripleo::profile::base::cinder::backup::nfs' do
     let(:pre_condition) do
       <<-EOF
-      class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
-      class { '::tripleo::profile::base::cinder::backup': step => #{params[:step]} }
+      class { 'tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
+      class { 'tripleo::profile::base::cinder::backup': step => #{params[:step]} }
       EOF
     end
 
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
index ad5a2774f..fe101e1b6 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 describe 'tripleo::profile::base::cinder::backup' do
   shared_examples_for 'tripleo::profile::base::cinder::backup' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
+      "class { 'tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
     end
 
     context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
index 230d76632..f757dface 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
@@ -20,8 +20,8 @@ describe 'tripleo::profile::base::cinder::backup::swift' do
   shared_examples_for 'tripleo::profile::base::cinder::backup::swift' do
     let(:pre_condition) do
       <<-EOF
-      class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
-      class { '::tripleo::profile::base::cinder::backup': step => #{params[:step]} }
+      class { 'tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
+      class { 'tripleo::profile::base::cinder::backup': step => #{params[:step]} }
       EOF
     end
 
diff --git a/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb b/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
index 0333b1fea..10004401a 100644
--- a/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 describe 'tripleo::profile::base::cinder::scheduler' do
   shared_examples_for 'tripleo::profile::base::cinder::scheduler' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
+      "class { 'tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
     end
 
     context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
index dc7a6a4a3..a2e6f45c4 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
@@ -29,7 +29,7 @@ describe 'tripleo::profile::base::cinder::volume' do
 
     let(:pre_condition) do
       "
-        class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
+        class { 'tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
       "
     end
 
diff --git a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
index 313857e46..cddb8b9fa 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
@@ -25,7 +25,7 @@ describe 'tripleo::profile::base::gnocchi::api' do
   shared_examples_for 'tripleo::profile::base::gnocchi::api' do
     let(:pre_condition) do
       "
-        class { '::tripleo::profile::base::gnocchi': step => #{params[:step]}, }
+        class { 'tripleo::profile::base::gnocchi': step => #{params[:step]}, }
       "
     end
 
diff --git a/spec/classes/tripleo_profile_base_horizon_spec.rb b/spec/classes/tripleo_profile_base_horizon_spec.rb
index d8a672b9c..027b527e9 100644
--- a/spec/classes/tripleo_profile_base_horizon_spec.rb
+++ b/spec/classes/tripleo_profile_base_horizon_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 describe 'tripleo::profile::base::horizon' do
   shared_examples_for 'tripleo::profile::base::horizon' do
     let(:pre_condition) do
-      "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
+      "class { 'tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
     end
 
     context 'with step less than 3' do
diff --git a/spec/classes/tripleo_profile_base_ironic_api_spec.rb b/spec/classes/tripleo_profile_base_ironic_api_spec.rb
index c5c1dc0d6..9fe0a64a3 100644
--- a/spec/classes/tripleo_profile_base_ironic_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_ironic_api_spec.rb
@@ -25,7 +25,7 @@ describe 'tripleo::profile::base::ironic::api' do
 
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::ironic':
+      class { 'tripleo::profile::base::ironic':
         step => #{params[:step]},
         oslomsg_rpc_hosts    => [ 'localhost' ],
         oslomsg_rpc_username => 'ironic',
diff --git a/spec/classes/tripleo_profile_base_manila_api_spec.rb b/spec/classes/tripleo_profile_base_manila_api_spec.rb
index 3345d4451..957690cd2 100644
--- a/spec/classes/tripleo_profile_base_manila_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_api_spec.rb
@@ -25,7 +25,7 @@ describe 'tripleo::profile::base::manila::api' do
 
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::manila':
+      class { 'tripleo::profile::base::manila':
         step => #{params[:step]},
         oslomsg_rpc_hosts    => [ 'localhost' ],
         oslomsg_rpc_username => 'manila',
diff --git a/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb b/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb
index 276d3f325..a58f8a15d 100644
--- a/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb
@@ -25,7 +25,7 @@ describe 'tripleo::profile::base::manila::scheduler' do
 
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::manila':
+      class { 'tripleo::profile::base::manila':
         step => #{params[:step]},
         oslomsg_rpc_hosts    => [ 'localhost' ],
         oslomsg_rpc_username => 'manila',
diff --git a/spec/classes/tripleo_profile_base_manila_share_spec.rb b/spec/classes/tripleo_profile_base_manila_share_spec.rb
index 07c651060..aaae3e100 100644
--- a/spec/classes/tripleo_profile_base_manila_share_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_share_spec.rb
@@ -25,7 +25,7 @@ describe 'tripleo::profile::base::manila::share' do
 
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::manila':
+      class { 'tripleo::profile::base::manila':
         step => #{params[:step]},
         oslomsg_rpc_hosts    => [ 'localhost' ],
         oslomsg_rpc_username => 'manila',
diff --git a/spec/classes/tripleo_profile_base_neutron_server_spec.rb b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
index a26722de7..918a4205c 100644
--- a/spec/classes/tripleo_profile_base_neutron_server_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
@@ -24,7 +24,7 @@ describe 'tripleo::profile::base::neutron::server' do
 
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::neutron':
+      class { 'tripleo::profile::base::neutron':
         oslomsg_rpc_hosts    => [ 'localhost' ],
         oslomsg_rpc_username => 'neutron',
         oslomsg_rpc_password => 'foo'
diff --git a/spec/classes/tripleo_profile_base_nova_api_spec.rb b/spec/classes/tripleo_profile_base_nova_api_spec.rb
index 1c3373658..da4af951a 100644
--- a/spec/classes/tripleo_profile_base_nova_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_api_spec.rb
@@ -20,13 +20,13 @@ describe 'tripleo::profile::base::nova::api' do
   shared_examples_for 'tripleo::profile::base::nova::api' do
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::nova':
+      class { 'tripleo::profile::base::nova':
         step => #{params[:step]},
         oslomsg_rpc_hosts    => [ 'localhost' ],
         oslomsg_rpc_username => 'nova',
         oslomsg_rpc_password => 'foo'
       }
-      class { '::tripleo::profile::base::nova::authtoken':
+      class { 'tripleo::profile::base::nova::authtoken':
         step => #{params[:step]},
       }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
index e916b41b5..10ad36896 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
@@ -33,11 +33,11 @@ describe 'tripleo::profile::base::nova::compute::ironic' do
     context 'with step 4' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
-        class { '::tripleo::profile::base::nova::compute':
+        class { 'tripleo::profile::base::nova::compute':
           step => #{params[:step]},
         }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
index 0a9ae80d1..9e1404665 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
@@ -24,7 +24,7 @@ describe 'tripleo::profile::base::nova::compute::libvirt' do
 
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova::compute_libvirt_shared':
+        class { 'tripleo::profile::base::nova::compute_libvirt_shared':
           step => #{params[:step]},
         }
 eos
@@ -43,20 +43,20 @@ eos
     context 'with step 4' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
-        class { '::tripleo::profile::base::nova::compute_libvirt_shared':
+        class { 'tripleo::profile::base::nova::compute_libvirt_shared':
           step => #{params[:step]},
         }
-        class { '::tripleo::profile::base::nova::compute':
+        class { 'tripleo::profile::base::nova::compute':
           step => #{params[:step]},
         }
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::migration::client':
+        class { 'tripleo::profile::base::nova::migration::client':
           step => #{params[:step]}
         }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_compute_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
index 0f6bb32e8..078b09943 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
@@ -40,14 +40,14 @@ describe 'tripleo::profile::base::nova::compute' do
     context 'with step 5' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::migration::client':
+        class { 'tripleo::profile::base::nova::migration::client':
           step => #{params[:step]}
         }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
index dbb1ef0ef..4aed8a263 100644
--- a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
@@ -20,7 +20,7 @@ describe 'tripleo::profile::base::nova::conductor' do
   shared_examples_for 'tripleo::profile::base::nova::conductor' do
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::nova':
+      class { 'tripleo::profile::base::nova':
         step => #{params[:step]},
         oslomsg_rpc_hosts => [ '127.0.0.1' ],
       }
diff --git a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
index ebaea5ae5..08900c07a 100644
--- a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
@@ -23,7 +23,7 @@ describe 'tripleo::profile::base::nova::libvirt' do
       let(:params) { { :step => 1, } }
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova::compute_libvirt_shared':
+        class { 'tripleo::profile::base::nova::compute_libvirt_shared':
           step => #{params[:step]}
         }
 eos
@@ -43,17 +43,17 @@ eos
     context 'with step 4' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::migration::client':
+        class { 'tripleo::profile::base::nova::migration::client':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::compute_libvirt_shared':
+        class { 'tripleo::profile::base::nova::compute_libvirt_shared':
           step => #{params[:step]}
         }
 eos
@@ -90,17 +90,17 @@ eos
     context 'with step 4 and libvirtd_config' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::migration::client':
+        class { 'tripleo::profile::base::nova::migration::client':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::compute_libvirt_shared':
+        class { 'tripleo::profile::base::nova::compute_libvirt_shared':
           step => #{params[:step]}
         }
 eos
@@ -134,17 +134,17 @@ eos
     context 'with step 4 and tls_password' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::migration::client':
+        class { 'tripleo::profile::base::nova::migration::client':
           step => #{params[:step]}
         }
-        class { '::tripleo::profile::base::nova::compute_libvirt_shared':
+        class { 'tripleo::profile::base::nova::compute_libvirt_shared':
           step => #{params[:step]}
         }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_metadata_spec.rb b/spec/classes/tripleo_profile_base_nova_metadata_spec.rb
index 73c0e226b..79dc4bf9e 100644
--- a/spec/classes/tripleo_profile_base_nova_metadata_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_metadata_spec.rb
@@ -20,13 +20,13 @@ describe 'tripleo::profile::base::nova::metadata' do
   shared_examples_for 'tripleo::profile::base::nova::metadata' do
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::nova':
+      class { 'tripleo::profile::base::nova':
         step => #{params[:step]},
         oslomsg_rpc_hosts    => [ 'localhost' ],
         oslomsg_rpc_username => 'nova',
         oslomsg_rpc_password => 'foo'
       }
-      class { '::tripleo::profile::base::nova::authtoken':
+      class { 'tripleo::profile::base::nova::authtoken':
         step => #{params[:step]},
       }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb b/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb
index 2b3dfc947..fa64e612c 100644
--- a/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb
@@ -22,8 +22,8 @@ describe 'tripleo::profile::base::nova::migration::client' do
     context 'with step 4' do
       let(:pre_condition) {
         <<-eos
-        include ::nova::compute::libvirt::services
-        class { '::tripleo::profile::base::nova::migration':
+        include nova::compute::libvirt::services
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
@@ -51,8 +51,8 @@ eos
     context 'with step 4 with libvirt' do
       let(:pre_condition) {
         <<-eos
-        include ::nova::compute::libvirt::services
-        class { '::tripleo::profile::base::nova::migration':
+        include nova::compute::libvirt::services
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
@@ -82,8 +82,8 @@ eos
     context 'with step 4 with libvirt TLS' do
       let(:pre_condition) {
         <<-eos
-        include ::nova::compute::libvirt::services
-        class { '::tripleo::profile::base::nova::migration':
+        include nova::compute::libvirt::services
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
@@ -115,8 +115,8 @@ eos
     context 'with step 4 with libvirt and migration ssh key' do
       let(:pre_condition) {
         <<-eos
-        include ::nova::compute::libvirt::services
-        class { '::tripleo::profile::base::nova::migration':
+        include nova::compute::libvirt::services
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
@@ -146,8 +146,8 @@ eos
     context 'with step 4 with libvirt TLS and migration ssh key' do
       let(:pre_condition) {
         <<-eos
-        include ::nova::compute::libvirt::services
-        class { '::tripleo::profile::base::nova::migration':
+        include nova::compute::libvirt::services
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb b/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb
index 71aaf7996..20c7c7331 100644
--- a/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb
@@ -22,7 +22,7 @@ describe 'tripleo::profile::base::nova::migration::proxy' do
     context 'with step 4 with defaults (disabled)' do
       let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
@@ -40,7 +40,7 @@ eos
     context 'with step 4 with ssh_private_key' do
       let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
@@ -66,7 +66,7 @@ eos
     context 'with step 4 with host and port' do
       let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
 eos
diff --git a/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb b/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb
index 4c872b740..767a86ec9 100644
--- a/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb
@@ -22,10 +22,10 @@ describe 'tripleo::profile::base::nova::migration::target' do
     context 'with step 4 without authorized_keys' do
       let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
@@ -53,10 +53,10 @@ eos
     context 'with step 4 without nova_migration_target service enabled' do
         let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
@@ -84,10 +84,10 @@ eos
     context 'with step 4 with invalid ssh_authorized_keys' do
         let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
@@ -104,10 +104,10 @@ eos
     context 'with step 4 with nova_migration_target services enabled' do
         let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
@@ -148,10 +148,10 @@ eos
     context 'with step 4 with ssh_localaddrs' do
         let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
@@ -199,10 +199,10 @@ eos
     context 'with step 4 with duplicate ssh_localaddrs' do
         let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
@@ -250,10 +250,10 @@ eos
     context 'with step 4 with invalid ssh_localaddrs' do
         let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
@@ -272,10 +272,10 @@ eos
     context 'with step 4 with wrapper_command' do
         let(:pre_condition) {
         <<-eos
-        class { '::tripleo::profile::base::nova::migration':
+        class { 'tripleo::profile::base::nova::migration':
           step => #{params[:step]}
         }
-        class { '::ssh::server':
+        class { 'ssh::server':
           storeconfigs_enabled => false,
           options              => {}
         }
diff --git a/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb b/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
index eb2372f93..f4fd92614 100644
--- a/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
@@ -33,7 +33,7 @@ describe 'tripleo::profile::base::nova::scheduler' do
     context 'with step 4' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
diff --git a/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb b/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
index 902b27ca4..4a684dc75 100644
--- a/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
@@ -32,7 +32,7 @@ describe 'tripleo::profile::base::nova::vncproxy' do
     context 'with step 4' do
       let(:pre_condition) do
         <<-eos
-        class { '::tripleo::profile::base::nova':
+        class { 'tripleo::profile::base::nova':
           step => #{params[:step]},
           oslomsg_rpc_hosts => [ '127.0.0.1' ],
         }
diff --git a/spec/classes/tripleo_profile_base_novajoin_spec.rb b/spec/classes/tripleo_profile_base_novajoin_spec.rb
index e157d4f21..73489ee04 100644
--- a/spec/classes/tripleo_profile_base_novajoin_spec.rb
+++ b/spec/classes/tripleo_profile_base_novajoin_spec.rb
@@ -20,7 +20,7 @@ describe 'tripleo::profile::base::novajoin' do
 
   let :pre_condition do
     "include nova
-     class { '::nova::metadata::novajoin::authtoken':
+     class { 'nova::metadata::novajoin::authtoken':
        password => 'passw0rd',
      }"
   end
diff --git a/spec/classes/tripleo_profile_base_placement_spec.rb b/spec/classes/tripleo_profile_base_placement_spec.rb
index 6a4eece4d..7f22b13ef 100644
--- a/spec/classes/tripleo_profile_base_placement_spec.rb
+++ b/spec/classes/tripleo_profile_base_placement_spec.rb
@@ -20,10 +20,10 @@ describe 'tripleo::profile::base::placement::api' do
   shared_examples_for 'tripleo::profile::base::placement::api' do
     let(:pre_condition) do
       <<-eos
-      class { '::tripleo::profile::base::placement':
+      class { 'tripleo::profile::base::placement':
         step => #{params[:step]},
       }
-      class { '::tripleo::profile::base::placement::authtoken':
+      class { 'tripleo::profile::base::placement::authtoken':
         step     => #{params[:step]},
       }
 eos
diff --git a/spec/classes/tripleo_profile_base_swift_proxy_spec.rb b/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
index 025223725..53efb242d 100644
--- a/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
@@ -24,14 +24,14 @@ describe 'tripleo::profile::base::swift::proxy' do
   shared_examples_for 'tripleo::profile::base::swift::proxy' do
 
     let :pre_condition do
-      "class { '::swift':
+      "class { 'swift':
          swift_hash_path_prefix => 'foo',
        }
-       include ::memcached
-       class { '::swift::proxy':
+       include memcached
+       class { 'swift::proxy':
          proxy_local_net_ip => '127.0.0.1',
        }
-       include ::swift::proxy::tempauth
+       include swift::proxy::tempauth
       "
     end
 
diff --git a/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb b/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb
index 013981502..69f58bc1b 100644
--- a/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb
+++ b/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb
@@ -20,7 +20,7 @@ describe 'tripleo::profile::base::swift::ringbuilder' do
   shared_examples_for 'tripleo::profile::base::swift::ringbuilder' do
 
     let :pre_condition do
-      "class { '::swift':
+      "class { 'swift':
          swift_hash_path_prefix => 'foo',
        }"
     end
diff --git a/spec/defines/tripleo_firewall_service_rules_spec.rb b/spec/defines/tripleo_firewall_service_rules_spec.rb
index cdf8fe4f8..bacb6d9a0 100644
--- a/spec/defines/tripleo_firewall_service_rules_spec.rb
+++ b/spec/defines/tripleo_firewall_service_rules_spec.rb
@@ -4,7 +4,7 @@ describe 'tripleo::firewall::service_rules' do
 
 
   let :pre_condition do
-    'include ::tripleo::firewall'
+    'include tripleo::firewall'
   end
 
   shared_examples_for 'tripleo firewall service rules' do
diff --git a/spec/defines/tripleo_haproxy_endpoint_spec.rb b/spec/defines/tripleo_haproxy_endpoint_spec.rb
index 28557e677..bcca6a44d 100644
--- a/spec/defines/tripleo_haproxy_endpoint_spec.rb
+++ b/spec/defines/tripleo_haproxy_endpoint_spec.rb
@@ -5,7 +5,7 @@ describe 'tripleo::haproxy::endpoint' do
   let(:title) { 'neutron' }
 
   let :pre_condition do
-    'include ::haproxy'
+    'include haproxy'
   end
 
   let :params do {
@@ -58,7 +58,7 @@ describe 'tripleo::haproxy::endpoint' do
         })
       end
       let :pre_condition do
-        'include ::haproxy
+        'include haproxy
         ::tripleo::haproxy::userlist {"starwars": users => ["leia password sister"]}
         '
       end
diff --git a/spec/defines/tripleo_haproxy_service_endpoints_spec.rb b/spec/defines/tripleo_haproxy_service_endpoints_spec.rb
index 83d4e8d4b..b5d6863be 100644
--- a/spec/defines/tripleo_haproxy_service_endpoints_spec.rb
+++ b/spec/defines/tripleo_haproxy_service_endpoints_spec.rb
@@ -4,7 +4,7 @@ describe 'tripleo::haproxy::service_endpoints' do
 
 
   let :pre_condition do
-    'include ::haproxy'
+    'include haproxy'
   end
 
   shared_examples_for 'tripleo haproxy service_endpoints' do
diff --git a/spec/defines/tripleo_haproxy_userlist_spec.rb b/spec/defines/tripleo_haproxy_userlist_spec.rb
index bc465a45b..122869b2c 100644
--- a/spec/defines/tripleo_haproxy_userlist_spec.rb
+++ b/spec/defines/tripleo_haproxy_userlist_spec.rb
@@ -5,7 +5,7 @@ describe 'tripleo::haproxy::userlist' do
   let(:title) { 'starwars' }
 
   let :pre_condition do
-    'include ::haproxy'
+    'include haproxy'
   end
 
   let :params do {
diff --git a/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb b/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb
index ca293ce57..2c53413ff 100644
--- a/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb
+++ b/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb
@@ -21,7 +21,7 @@ describe 'tripleo::profile::base::logging::rsyslog::file_input' do
   let(:title) { 'foobar' }
 
   let :pre_condition do
-    'include ::rsyslog::server'
+    'include rsyslog::server'
   end
 
   let :params do {