diff --git a/examples/init.pp b/examples/init.pp
index 5f1ddb1..cc1c54d 100644
--- a/examples/init.pp
+++ b/examples/init.pp
@@ -9,4 +9,4 @@
 # Learn more about module testing here:
 # https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module
 #
-include ::zaqar
+include zaqar
diff --git a/manifests/client.pp b/manifests/client.pp
index fb27099..95e792e 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -12,8 +12,8 @@ class zaqar::client (
   $ensure = 'present'
 ) {
 
-  include ::zaqar::deps
-  include ::zaqar::params
+  include zaqar::deps
+  include zaqar::params
 
   package { 'python-zaqarclient':
     ensure => $ensure,
diff --git a/manifests/config.pp b/manifests/config.pp
index 4f8a07d..4769fba 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -24,7 +24,7 @@ class zaqar::config (
   $zaqar_config = {},
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   validate_legacy(Hash, 'validate_hash', $zaqar_config)
 
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 222e22f..41c7b41 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -43,7 +43,7 @@ class zaqar::db::mysql(
   $allowed_hosts = undef
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   validate_legacy(String, 'validate_string', $password)
 
diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp
index 0c4f5a4..bbf2df6 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -32,7 +32,7 @@ class zaqar::db::postgresql(
   $privileges = 'ALL',
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   ::openstacklib::db::postgresql { 'zaqar':
     password_hash => postgresql_password($user, $password),
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 72002e8..32899fc 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -3,7 +3,7 @@
 #
 class zaqar::db::sync {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   exec { 'zaqar-db-sync':
     command     => 'zaqar-sql-db-manage upgrade head',
diff --git a/manifests/init.pp b/manifests/init.pp
index f1fb85b..636267b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -88,15 +88,15 @@ class zaqar(
   $purge_config           = false,
 ) inherits zaqar::params {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   resources { 'zaqar_config':
     purge  => $purge_config,
   }
 
   if $auth_strategy == 'keystone' {
-    include ::zaqar::keystone::authtoken
-    include ::zaqar::keystone::trust
+    include zaqar::keystone::authtoken
+    include zaqar::keystone::trust
   }
 
   package { 'zaqar-common':
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index d6a553f..2dde31f 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -86,7 +86,7 @@ class zaqar::keystone::auth(
   $roles                  = undef,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   validate_legacy(String, 'validate_string', $password)
 
diff --git a/manifests/keystone/auth_websocket.pp b/manifests/keystone/auth_websocket.pp
index de2ab77..5ef874a 100644
--- a/manifests/keystone/auth_websocket.pp
+++ b/manifests/keystone/auth_websocket.pp
@@ -74,7 +74,7 @@ class zaqar::keystone::auth_websocket(
   $service_description    = 'Openstack messaging websocket Service',
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   validate_legacy(String, 'validate_string', $password)
 
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index e45e3d0..2965af2 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -203,7 +203,7 @@ class zaqar::keystone::authtoken(
   $service_token_roles_required   = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   if is_service_default($password) {
     fail('Please set password for Zaqar service user')
diff --git a/manifests/keystone/trust.pp b/manifests/keystone/trust.pp
index 9ad6966..61a6441 100644
--- a/manifests/keystone/trust.pp
+++ b/manifests/keystone/trust.pp
@@ -37,7 +37,7 @@ class zaqar::keystone::trust(
   $auth_type                      = 'password',
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'trustee/username': value => $username;
diff --git a/manifests/logging.pp b/manifests/logging.pp
index a2e5a10..12e9c3b 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -123,7 +123,7 @@ class zaqar::logging(
   $log_date_format               = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   oslo::log { 'zaqar_config':
     logging_context_format_string => $logging_context_format_string,
diff --git a/manifests/management/mongodb.pp b/manifests/management/mongodb.pp
index 2e5710b..062abde 100644
--- a/manifests/management/mongodb.pp
+++ b/manifests/management/mongodb.pp
@@ -71,7 +71,7 @@ class zaqar::management::mongodb(
   $reconnect_sleep        = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'drivers:management_store:mongodb/uri':                    value => $uri, secret => true;
diff --git a/manifests/management/sqlalchemy.pp b/manifests/management/sqlalchemy.pp
index 16c512d..7cd6d19 100644
--- a/manifests/management/sqlalchemy.pp
+++ b/manifests/management/sqlalchemy.pp
@@ -7,7 +7,7 @@ class zaqar::management::sqlalchemy(
   $uri,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'drivers:management_store:sqlalchemy/uri': value => $uri, secret => true;
diff --git a/manifests/messaging/mongodb.pp b/manifests/messaging/mongodb.pp
index 0e82aed..d268f18 100644
--- a/manifests/messaging/mongodb.pp
+++ b/manifests/messaging/mongodb.pp
@@ -78,7 +78,7 @@ class zaqar::messaging::mongodb(
   $partitions             = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'drivers:message_store:mongodb/uri':                    value => $uri, secret => true;
diff --git a/manifests/messaging/redis.pp b/manifests/messaging/redis.pp
index 25fa080..3456a49 100644
--- a/manifests/messaging/redis.pp
+++ b/manifests/messaging/redis.pp
@@ -20,7 +20,7 @@ class zaqar::messaging::redis(
   $reconnect_sleep        = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'drivers:message_store:redis/uri':                    value => $uri, secret => true;
diff --git a/manifests/messaging/swift.pp b/manifests/messaging/swift.pp
index 281a907..f474e95 100644
--- a/manifests/messaging/swift.pp
+++ b/manifests/messaging/swift.pp
@@ -11,7 +11,7 @@ class zaqar::messaging::swift(
   $auth_url = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'drivers:message_store:swift/uri':      value => $uri, secret => true;
diff --git a/manifests/params.pp b/manifests/params.pp
index d021b70..6de279c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,7 +3,7 @@
 # Parameters for puppet-zaqar
 #
 class zaqar::params {
-  include ::openstacklib::defaults
+  include openstacklib::defaults
 
   $pyvers = $::openstacklib::defaults::pyvers
   $pyver3 = $::openstacklib::defaults::pyver3
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 6163526..b8aaf2a 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -28,8 +28,8 @@ class zaqar::policy (
   $policy_path = '/etc/zaqar/policy.json',
 ) {
 
-  include ::zaqar::deps
-  include ::zaqar::params
+  include zaqar::deps
+  include zaqar::params
 
   validate_legacy(Hash, 'validate_hash', $policies)
 
diff --git a/manifests/server.pp b/manifests/server.pp
index aea5ef2..bb48840 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -26,10 +26,10 @@ class zaqar::server(
   $service_name   = $::zaqar::params::service_name,
 ) inherits zaqar::params {
 
-  include ::zaqar
-  include ::zaqar::deps
-  include ::zaqar::params
-  include ::zaqar::policy
+  include zaqar
+  include zaqar::deps
+  include zaqar::params
+  include zaqar::policy
 
   if $enabled {
     if $manage_service {
@@ -51,7 +51,7 @@ class zaqar::server(
     }
 
   } elsif $service_name == 'httpd' {
-    include ::apache::params
+    include apache::params
     service { $::zaqar::params::service_name:
       ensure => 'stopped',
       name   => $::zaqar::params::service_name,
diff --git a/manifests/server_instance.pp b/manifests/server_instance.pp
index df24de6..ba76ed8 100644
--- a/manifests/server_instance.pp
+++ b/manifests/server_instance.pp
@@ -16,9 +16,9 @@ define zaqar::server_instance(
   $enabled = true,
 ) {
 
-  include ::zaqar
-  include ::zaqar::deps
-  include ::zaqar::params
+  include zaqar
+  include zaqar::deps
+  include zaqar::params
 
   if $enabled {
     $service_ensure = 'running'
diff --git a/manifests/transport/websocket.pp b/manifests/transport/websocket.pp
index 535bae9..5fa3b61 100644
--- a/manifests/transport/websocket.pp
+++ b/manifests/transport/websocket.pp
@@ -28,7 +28,7 @@ class zaqar::transport::websocket(
   $notification_port  = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'drivers:transport:websocket/bind': value => $bind;
diff --git a/manifests/transport/wsgi.pp b/manifests/transport/wsgi.pp
index 0ac1835..edf5ed7 100644
--- a/manifests/transport/wsgi.pp
+++ b/manifests/transport/wsgi.pp
@@ -13,7 +13,7 @@ class zaqar::transport::wsgi(
   $port = $::os_service_default,
 ) {
 
-  include ::zaqar::deps
+  include zaqar::deps
 
   zaqar_config {
     'drivers:transport:wsgi/bind': value => $bind;
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 3fa0fae..352a7d2 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -119,12 +119,12 @@ class zaqar::wsgi::apache (
   $custom_wsgi_process_options = {},
 ) {
 
-  include ::zaqar::deps
-  include ::zaqar::params
-  include ::apache
-  include ::apache::mod::wsgi
+  include zaqar::deps
+  include zaqar::params
+  include apache
+  include apache::mod::wsgi
   if $ssl {
-    include ::apache::mod::ssl
+    include apache::mod::ssl
   }
 
   ::openstacklib::wsgi::apache { 'zaqar_wsgi':
diff --git a/spec/acceptance/zaqar_swift_spec.rb b/spec/acceptance/zaqar_swift_spec.rb
index 3a14d73..cff9d47 100644
--- a/spec/acceptance/zaqar_swift_spec.rb
+++ b/spec/acceptance/zaqar_swift_spec.rb
@@ -6,13 +6,13 @@ describe 'swift zaqar' do
 
     it 'zaqar with swift should work with no errors' do
       pp= <<-EOS
-      include ::openstack_integration
-      include ::openstack_integration::repos
-      include ::openstack_integration::mysql
-      include ::openstack_integration::keystone
-      include ::openstack_integration::swift
-      include ::openstack_integration::memcached
-      include ::openstack_integration::zaqar
+      include openstack_integration
+      include openstack_integration::repos
+      include openstack_integration::mysql
+      include openstack_integration::keystone
+      include openstack_integration::swift
+      include openstack_integration::memcached
+      include openstack_integration::zaqar
       EOS
 
 
diff --git a/spec/classes/zaqar_init_spec.rb b/spec/classes/zaqar_init_spec.rb
index b155557..80d273e 100644
--- a/spec/classes/zaqar_init_spec.rb
+++ b/spec/classes/zaqar_init_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 describe 'zaqar' do
   shared_examples 'zaqar' do
     let :pre_condition do
-      "class { '::zaqar::keystone::authtoken':
+      "class { 'zaqar::keystone::authtoken':
          password =>'password',
        }"
     end
diff --git a/spec/classes/zaqar_management_mongodb_spec.rb b/spec/classes/zaqar_management_mongodb_spec.rb
index 0e40009..ad203ea 100644
--- a/spec/classes/zaqar_management_mongodb_spec.rb
+++ b/spec/classes/zaqar_management_mongodb_spec.rb
@@ -4,10 +4,10 @@ describe 'zaqar::management::mongodb' do
 
   shared_examples_for 'zaqar::management::mongodb' do
     let :pre_condition do
-      "class { '::zaqar::keystone::authtoken':
+      "class { 'zaqar::keystone::authtoken':
          password =>'foo',
        }
-       class { '::zaqar':
+       class { 'zaqar':
        }"
 
     end
diff --git a/spec/classes/zaqar_management_sqlalchemy_spec.rb b/spec/classes/zaqar_management_sqlalchemy_spec.rb
index 88b5809..e27846d 100644
--- a/spec/classes/zaqar_management_sqlalchemy_spec.rb
+++ b/spec/classes/zaqar_management_sqlalchemy_spec.rb
@@ -4,10 +4,10 @@ describe 'zaqar::management::sqlalchemy' do
 
   shared_examples_for 'zaqar::management::sqlalchemy' do
     let :pre_condition do
-      "class { '::zaqar::keystone::authtoken':
+      "class { 'zaqar::keystone::authtoken':
          password =>'foo',
        }
-       class { '::zaqar':
+       class { 'zaqar':
          management_store =>'sqlalchemy',
        }"
 
diff --git a/spec/classes/zaqar_messaging_mongodb_spec.rb b/spec/classes/zaqar_messaging_mongodb_spec.rb
index 47aef4a..54becd5 100644
--- a/spec/classes/zaqar_messaging_mongodb_spec.rb
+++ b/spec/classes/zaqar_messaging_mongodb_spec.rb
@@ -4,10 +4,10 @@ describe 'zaqar::messaging::mongodb' do
 
   shared_examples_for 'zaqar::messaging::mongodb' do
     let :pre_condition do
-      "class { '::zaqar::keystone::authtoken':
+      "class { 'zaqar::keystone::authtoken':
          password =>'foo',
        }
-       class { '::zaqar':
+       class { 'zaqar':
        }"
 
     end
diff --git a/spec/classes/zaqar_messaging_redis_spec.rb b/spec/classes/zaqar_messaging_redis_spec.rb
index 3de7465..4dfac76 100644
--- a/spec/classes/zaqar_messaging_redis_spec.rb
+++ b/spec/classes/zaqar_messaging_redis_spec.rb
@@ -4,10 +4,10 @@ describe 'zaqar::messaging::redis' do
 
   shared_examples_for 'zaqar::messaging::redis' do
     let :pre_condition do
-      "class { '::zaqar::keystone::authtoken':
+      "class { 'zaqar::keystone::authtoken':
          password =>'foo',
        }
-       class { '::zaqar':
+       class { 'zaqar':
          message_store =>'redis',
        }"
 
diff --git a/spec/classes/zaqar_messaging_swift_spec.rb b/spec/classes/zaqar_messaging_swift_spec.rb
index d39e6ab..48ed9fe 100644
--- a/spec/classes/zaqar_messaging_swift_spec.rb
+++ b/spec/classes/zaqar_messaging_swift_spec.rb
@@ -4,10 +4,10 @@ describe 'zaqar::messaging::swift' do
 
   shared_examples_for 'zaqar::messaging::swift' do
     let :pre_condition do
-      "class { '::zaqar::keystone::authtoken':
+      "class { 'zaqar::keystone::authtoken':
          password =>'foo',
        }
-       class { '::zaqar':
+       class { 'zaqar':
          message_store =>'swift',
        }"
     end
diff --git a/spec/classes/zaqar_server_spec.rb b/spec/classes/zaqar_server_spec.rb
index 99981b3..207963c 100644
--- a/spec/classes/zaqar_server_spec.rb
+++ b/spec/classes/zaqar_server_spec.rb
@@ -4,7 +4,7 @@ describe 'zaqar::server' do
   shared_examples_for 'zaqar::server' do
     describe 'with a zaqar server enabled' do
       let :pre_condition do
-        "class { '::zaqar::keystone::authtoken':
+        "class { 'zaqar::keystone::authtoken':
            password =>'foo',
          }
          class {'::zaqar': }"
diff --git a/spec/defines/zaqar_server_instance_spec.rb b/spec/defines/zaqar_server_instance_spec.rb
index 8d77812..23fd103 100644
--- a/spec/defines/zaqar_server_instance_spec.rb
+++ b/spec/defines/zaqar_server_instance_spec.rb
@@ -5,7 +5,7 @@ describe 'zaqar::server_instance' do
     let(:title) { '1' }
 
     let :pre_condition do
-      "class { '::zaqar::keystone::authtoken':
+      "class { 'zaqar::keystone::authtoken':
          password =>'foo',
        }
        class {'::zaqar': }"