diff --git a/examples/site.pp b/examples/site.pp
index a385ddc2..b4403e33 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -5,7 +5,7 @@ class { 'gnocchi::keystone::auth':
   internal_url => 'http://10.0.0.1:8041',
   public_url   => 'http://10.0.0.1:8041',
   password     => 'verysecrete',
-  region       => 'OpenStack'
+  region       => 'OpenStack',
 }
 
 class { 'gnocchi':
@@ -15,7 +15,7 @@ class { 'gnocchi':
 class { 'gnocchi::api':
   bind_host         => '10.0.0.1',
   identity_uri      => 'https://identity.openstack.org:5000',
-  keystone_password => 'verysecrete'
+  keystone_password => 'verysecrete',
 }
 
 class { 'gnocchi::statsd':
diff --git a/manifests/api.pp b/manifests/api.pp
index f6d87457..eac9b75c 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -26,7 +26,7 @@
 #   service, and you must use another class to configure that
 #   web service. For example, use class { 'gnocchi::wsgi::apache'...}
 #   to make gnocchi-api be a web app using apache mod_wsgi.
-#   Defaults to '$::gnocchi::params::api_service_name'
+#   Defaults to '$gnocchi::params::api_service_name'
 #
 # [*sync_db*]
 #   (optional) Run gnocchi-upgrade db sync on api nodes after installing the package.
@@ -60,7 +60,7 @@ class gnocchi::api (
   Boolean $enabled              = true,
   $package_ensure               = 'present',
   $max_limit                    = $facts['os_service_default'],
-  $service_name                 = $::gnocchi::params::api_service_name,
+  $service_name                 = $gnocchi::params::api_service_name,
   Boolean $sync_db              = false,
   $auth_strategy                = 'keystone',
   $paste_config                 = $facts['os_service_default'],
@@ -74,7 +74,7 @@ class gnocchi::api (
 
   package { 'gnocchi-api':
     ensure => $package_ensure,
-    name   => $::gnocchi::params::api_package_name,
+    name   => $gnocchi::params::api_package_name,
     tag    => ['openstack', 'gnocchi-package'],
   }
 
@@ -89,10 +89,10 @@ class gnocchi::api (
       $service_ensure = 'stopped'
     }
 
-    if $service_name == $::gnocchi::params::api_service_name {
+    if $service_name == $gnocchi::params::api_service_name {
       service { 'gnocchi-api':
         ensure     => $service_ensure,
-        name       => $::gnocchi::params::api_service_name,
+        name       => $gnocchi::params::api_service_name,
         enable     => $enabled,
         hasstatus  => true,
         hasrestart => true,
@@ -107,7 +107,7 @@ class gnocchi::api (
     } elsif $service_name == 'httpd' {
       service { 'gnocchi-api':
         ensure => 'stopped',
-        name   => $::gnocchi::params::api_service_name,
+        name   => $gnocchi::params::api_service_name,
         enable => false,
         tag    => ['gnocchi-service', 'gnocchi-db-sync-service'],
       }
diff --git a/manifests/client.pp b/manifests/client.pp
index 8676b92d..868b9f4a 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -14,7 +14,7 @@ class gnocchi::client (
 
   package { 'python-gnocchiclient':
     ensure => $ensure,
-    name   => $::gnocchi::params::client_package_name,
+    name   => $gnocchi::params::client_package_name,
     tag    => 'openstack',
   }
 
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index cfb9b76b..683298ba 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -3,7 +3,7 @@
 #
 # [*user*]
 #   (Optional) User to run dbsync command.
-#   Defaults to $::gnocchi::params::user
+#   Defaults to $gnocchi::params::user
 #
 # [*extra_opts*]
 #   (Optional) String of extra command line parameters to append
@@ -15,7 +15,7 @@
 #   Defaults to 300
 #
 class gnocchi::db::sync (
-  $user            = $::gnocchi::params::user,
+  $user            = $gnocchi::params::user,
   $extra_opts      = undef,
   $db_sync_timeout = 300,
 ) inherits gnocchi::params {
diff --git a/manifests/init.pp b/manifests/init.pp
index 53b31f65..d0e25e24 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,7 +27,7 @@ class gnocchi (
 
   package { 'gnocchi':
     ensure => $package_ensure,
-    name   => $::gnocchi::params::common_package_name,
+    name   => $gnocchi::params::common_package_name,
     tag    => ['openstack', 'gnocchi-package'],
   }
 
diff --git a/manifests/metricd.pp b/manifests/metricd.pp
index 97c000fb..b5c1f854 100644
--- a/manifests/metricd.pp
+++ b/manifests/metricd.pp
@@ -64,7 +64,7 @@ class gnocchi::metricd (
 
   package { 'gnocchi-metricd':
     ensure => $package_ensure,
-    name   => $::gnocchi::params::metricd_package_name,
+    name   => $gnocchi::params::metricd_package_name,
     tag    => ['openstack', 'gnocchi-package'],
   }
 
@@ -77,7 +77,7 @@ class gnocchi::metricd (
 
     service { 'gnocchi-metricd':
       ensure     => $service_ensure,
-      name       => $::gnocchi::params::metricd_service_name,
+      name       => $gnocchi::params::metricd_service_name,
       enable     => $enabled,
       hasstatus  => true,
       hasrestart => true,
diff --git a/manifests/policy.pp b/manifests/policy.pp
index c01b2cf2..7bc1c9a0 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -62,7 +62,7 @@ class gnocchi::policy (
     policies     => $policies,
     policy_path  => $policy_path,
     file_user    => 'root',
-    file_group   => $::gnocchi::params::group,
+    file_group   => $gnocchi::params::group,
     file_format  => 'yaml',
     purge_config => $purge_config,
   }
diff --git a/manifests/statsd.pp b/manifests/statsd.pp
index d950528b..9c688518 100644
--- a/manifests/statsd.pp
+++ b/manifests/statsd.pp
@@ -53,7 +53,7 @@ class gnocchi::statsd (
 
   package { 'gnocchi-statsd':
     ensure => $package_ensure,
-    name   => $::gnocchi::params::statsd_package_name,
+    name   => $gnocchi::params::statsd_package_name,
     tag    => ['openstack', 'gnocchi-package'],
   }
 
@@ -66,7 +66,7 @@ class gnocchi::statsd (
 
     service { 'gnocchi-statsd':
       ensure     => $service_ensure,
-      name       => $::gnocchi::params::statsd_service_name,
+      name       => $gnocchi::params::statsd_service_name,
       enable     => $enabled,
       hasstatus  => true,
       hasrestart => true,
diff --git a/manifests/storage/ceph.pp b/manifests/storage/ceph.pp
index dbe6dea6..ca578981 100644
--- a/manifests/storage/ceph.pp
+++ b/manifests/storage/ceph.pp
@@ -91,7 +91,7 @@ class gnocchi::storage::ceph(
   if $manage_rados {
     stdlib::ensure_packages('python-rados', {
       'ensure' => $package_ensure,
-      'name'   => $::gnocchi::params::rados_package_name,
+      'name'   => $gnocchi::params::rados_package_name,
       'tag'    => ['openstack','gnocchi-package'],
     })
   }
diff --git a/manifests/storage/s3.pp b/manifests/storage/s3.pp
index 33092f68..d3c95d0d 100644
--- a/manifests/storage/s3.pp
+++ b/manifests/storage/s3.pp
@@ -49,7 +49,7 @@ class gnocchi::storage::s3(
   if $manage_boto3 {
     stdlib::ensure_packages('python-boto3', {
       'ensure' => $package_ensure,
-      'name'   => $::gnocchi::params::boto3_package_name,
+      'name'   => $gnocchi::params::boto3_package_name,
       'tag'    => ['openstack','gnocchi-package'],
     })
   }
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index c2056c96..d64d68a9 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -175,7 +175,7 @@ class gnocchi::wsgi::apache (
   openstacklib::wsgi::apache { 'gnocchi_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
-    group                       => $::gnocchi::params::group,
+    group                       => $gnocchi::params::group,
     path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
@@ -188,15 +188,15 @@ class gnocchi::wsgi::apache (
     ssl_crl_path                => $ssl_crl_path,
     ssl_key                     => $ssl_key,
     threads                     => $threads,
-    user                        => $::gnocchi::params::user,
+    user                        => $gnocchi::params::user,
     vhost_custom_fragment       => $vhost_custom_fragment,
     workers                     => $workers,
     wsgi_daemon_process         => 'gnocchi',
     wsgi_process_display_name   => $wsgi_process_display_name,
     wsgi_process_group          => 'gnocchi',
-    wsgi_script_dir             => $::gnocchi::params::gnocchi_wsgi_script_path,
+    wsgi_script_dir             => $gnocchi::params::gnocchi_wsgi_script_path,
     wsgi_script_file            => 'app',
-    wsgi_script_source          => $::gnocchi::params::gnocchi_wsgi_script_source,
+    wsgi_script_source          => $gnocchi::params::gnocchi_wsgi_script_source,
     headers                     => $headers,
     request_headers             => $request_headers,
     custom_wsgi_process_options => $custom_wsgi_process_options,