diff --git a/Gemfile b/Gemfile
index 6ef55b6e..453ebc58 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,21 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'puppet-lint', '~> 0.3.2'
   gem 'rspec-puppet', '~> 1.0.1'
   gem 'rake', '10.1.1'
+
+  gem 'puppet-lint', '~> 1.1'
+  gem 'metadata-json-lint'
+  gem 'puppet-lint-absolute_classname-check'
+  gem 'puppet-lint-absolute_template_path'
+  gem 'puppet-lint-trailing_newline-check'
+
+  # Puppet 4.x related lint checks
+  gem 'puppet-lint-unquoted_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-numericvariable'
+
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
diff --git a/manifests/api.pp b/manifests/api.pp
index 472caca3..87285d65 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -93,7 +93,7 @@ class manila::api (
     'manila.api.v1.limits:RateLimitingMiddleware.factory'
 ) {
 
-  include manila::params
+  include ::manila::params
 
   Manila_config<||> ~> Service['manila-api']
   Manila_api_paste_ini<||> ~> Service['manila-api']
@@ -103,8 +103,8 @@ class manila::api (
     Package['manila-api'] -> Manila_api_paste_ini<||>
     Package['manila-api'] -> Service['manila-api']
     package { 'manila-api':
-      ensure  => $package_ensure,
-      name    => $::manila::params::api_package,
+      ensure => $package_ensure,
+      name   => $::manila::params::api_package,
     }
   }
 
@@ -138,7 +138,7 @@ class manila::api (
   }
 
   manila_config {
-    'DEFAULT/osapi_share_listen': value => $bind_host
+    'DEFAULT/osapi_share_listen': value => $bind_host,
   }
 
   if $os_region_name {
diff --git a/manifests/client.pp b/manifests/client.pp
index 900251dd..646e4120 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -11,7 +11,7 @@ class manila::client(
   $package_ensure = 'present'
 ) {
 
-  include manila::params
+  include ::manila::params
 
   package { 'python-manilaclient':
     ensure => $package_ensure,
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 88b2063f..7ece0f15 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -1,7 +1,7 @@
 #
 class manila::db::sync {
 
-  include manila::params
+  include ::manila::params
 
   exec { 'manila-manage db_sync':
     command     => $::manila::params::db_sync_command,
diff --git a/manifests/init.pp b/manifests/init.pp
index 7f83f7c6..df8b12ab 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -118,7 +118,7 @@ class manila (
   $rootwrap_config             = '/etc/manila/rootwrap.conf',
 ) {
 
-  include manila::params
+  include ::manila::params
 
   Package['manila'] -> Manila_config<||>
   Package['manila'] -> Manila_api_paste_ini<||>
diff --git a/manifests/qpid.pp b/manifests/qpid.pp
index bcae2cfe..864a4202 100644
--- a/manifests/qpid.pp
+++ b/manifests/qpid.pp
@@ -28,8 +28,8 @@ class manila::qpid(
     $service_ensure = 'stopped'
   }
 
-  class { 'qpid::server':
-    service_ensure => $service_ensure
+  class { '::qpid::server':
+    service_ensure => $service_ensure,
   }
 
 }
diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index c8f60cf9..76c4c129 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -6,7 +6,7 @@ class manila::scheduler (
   $manage_service   = true
 ) {
 
-  include manila::params
+  include ::manila::params
 
   Manila_config<||> ~> Service['manila-scheduler']
   Manila_api_paste_ini<||> ~> Service['manila-scheduler']
diff --git a/manifests/share.pp b/manifests/share.pp
index e8d8faae..037f13b7 100644
--- a/manifests/share.pp
+++ b/manifests/share.pp
@@ -5,7 +5,7 @@ class manila::share (
   $manage_service = true
 ) {
 
-  include manila::params
+  include ::manila::params
 
   Manila_config<||> ~> Service['manila-share']
   Manila_api_paste_ini<||> ~> Service['manila-share']
diff --git a/manifests/share/generic.pp b/manifests/share/generic.pp
index 55cc7f3a..24868a54 100644
--- a/manifests/share/generic.pp
+++ b/manifests/share/generic.pp
@@ -56,14 +56,14 @@ class manila::share::generic (
 ) {
 
   manila::backend::generic { 'DEFAULT':
-    smb_template_config_path          => $smb_template_config_path,
-    volume_name_template              => $volume_name_template,
-    volume_snapshot_name_template     => $volume_snapshot_name_template,
-    share_mount_path                  => $share_mount_path,
-    max_time_to_create_volume         => $max_time_to_create_volume,
-    max_time_to_attach                => $max_time_to_attach,
-    service_instance_smb_config_path  => $service_instance_smb_config_path,
-    share_helpers                     => $share_helpers,
-    share_volume_fstype               => $share_volume_fstype,
+    smb_template_config_path         => $smb_template_config_path,
+    volume_name_template             => $volume_name_template,
+    volume_snapshot_name_template    => $volume_snapshot_name_template,
+    share_mount_path                 => $share_mount_path,
+    max_time_to_create_volume        => $max_time_to_create_volume,
+    max_time_to_attach               => $max_time_to_attach,
+    service_instance_smb_config_path => $service_instance_smb_config_path,
+    share_helpers                    => $share_helpers,
+    share_volume_fstype              => $share_volume_fstype,
   }
 }
diff --git a/manifests/share/netapp.pp b/manifests/share/netapp.pp
index 954b92a6..ef535710 100644
--- a/manifests/share/netapp.pp
+++ b/manifests/share/netapp.pp
@@ -64,15 +64,15 @@ class manila::share::netapp (
 ) {
 
   manila::backend::netapp { 'DEFAULT':
-    netapp_nas_transport_type             => $netapp_nas_transport_type,
-    netapp_nas_login                      => $netapp_nas_login,
-    netapp_nas_password                   => $netapp_nas_password,
-    netapp_nas_server_hostname            => $netapp_nas_server_hostname,
-    netapp_nas_volume_name_template       => $netapp_nas_volume_name_template,
-    netapp_vserver_name_template          => $netapp_vserver_name_template,
-    netapp_lif_name_template              => $netapp_lif_name_template,
-    netapp_aggregate_name_search_pattern  => $netapp_aggregate_name_search_pattern,
-    netapp_root_volume_aggregate          => $netapp_root_volume_aggregate,
-    netapp_root_volume_name               => $netapp_root_volume_name,
+    netapp_nas_transport_type            => $netapp_nas_transport_type,
+    netapp_nas_login                     => $netapp_nas_login,
+    netapp_nas_password                  => $netapp_nas_password,
+    netapp_nas_server_hostname           => $netapp_nas_server_hostname,
+    netapp_nas_volume_name_template      => $netapp_nas_volume_name_template,
+    netapp_vserver_name_template         => $netapp_vserver_name_template,
+    netapp_lif_name_template             => $netapp_lif_name_template,
+    netapp_aggregate_name_search_pattern => $netapp_aggregate_name_search_pattern,
+    netapp_root_volume_aggregate         => $netapp_root_volume_aggregate,
+    netapp_root_volume_name              => $netapp_root_volume_name,
   }
 }
diff --git a/manifests/type.pp b/manifests/type.pp
index b4730767..5897706b 100644
--- a/manifests/type.pp
+++ b/manifests/type.pp
@@ -69,13 +69,13 @@ define manila::type (
   if ($set_value and $set_key) {
     Exec["manila type-create ${volume_name}"] ->
     manila::type_set { $set_value:
-      type            => $volume_name,
-      key             => $set_key,
-      os_password     => $os_password,
-      os_tenant_name  => $os_tenant_name,
-      os_username     => $os_username,
-      os_auth_url     => $os_auth_url,
-      os_region_name  => $os_region_name,
+      type           => $volume_name,
+      key            => $set_key,
+      os_password    => $os_password,
+      os_tenant_name => $os_tenant_name,
+      os_username    => $os_username,
+      os_auth_url    => $os_auth_url,
+      os_region_name => $os_region_name,
     }
   }
 }