diff --git a/Gemfile b/Gemfile
index 2243a4c5..aca61249 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,19 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'puppet-lint', '~> 0.3.2'
+
+  gem 'puppet-lint', '~> 1.1.0'
   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'
+
   gem 'rspec-puppet', '~> 1.0.1'
   gem 'rake', '10.1.1'
   gem 'rspec', '< 2.99'
diff --git a/examples/ironic.pp b/examples/ironic.pp
index e80680c7..71d5c268 100644
--- a/examples/ironic.pp
+++ b/examples/ironic.pp
@@ -33,15 +33,15 @@ $deploy_ramdisk = 'glance://deploy_ramdisk_uuid'
 
 node 'db' {
 
-  class { 'mysql::server':
+  class { '::mysql::server':
     config_hash => {
-      'bind_address' => '0.0.0.0'
-    }
+      'bind_address' => '0.0.0.0',
+    },
   }
 
-  class { 'mysql::ruby': }
+  class { '::mysql::ruby': }
 
-  class { 'ironic::db::mysql':
+  class { '::ironic::db::mysql':
     password      => $db_password,
     dbname        => $db_name,
     user          => $db_username,
@@ -53,7 +53,7 @@ node 'db' {
 
 node controller {
 
-  class { 'ironic':
+  class { '::ironic':
     db_password         => $db_password,
     db_name             => $db_name,
     db_user             => $db_username,
@@ -67,13 +67,13 @@ node controller {
     glance_api_servers  => $glance_api_servers,
   }
 
-  class { 'ironic::api': }
+  class { '::ironic::api': }
 
-  class { 'ironic::conductor': }
+  class { '::ironic::conductor': }
 
-  class { 'ironic::drivers::ipmi': }
+  class { '::ironic::drivers::ipmi': }
 
-  class { 'ironic::drivers::pxe':
+  class { '::ironic::drivers::pxe':
     deploy_kernel  => $deploy_kernel,
     deploy_ramdisk => $deploy_ramdisk,
   }
diff --git a/manifests/api.pp b/manifests/api.pp
index 8904d091..f3463170 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -94,8 +94,8 @@ class ironic::api (
   $admin_password,
 ) {
 
-  include ironic::params
-  include ironic::policy
+  include ::ironic::params
+  include ::ironic::policy
 
   Ironic_config<||> ~> Service['ironic-api']
   Class['ironic::policy'] ~> Service['ironic-api']
diff --git a/manifests/client.pp b/manifests/client.pp
index cded570b..fbc82266 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -30,7 +30,7 @@ class ironic::client (
   $package_ensure = present
 ) {
 
-  include ironic::params
+  include ::ironic::params
 
   package { 'python-ironicclient':
     ensure => $package_ensure,
diff --git a/manifests/conductor.pp b/manifests/conductor.pp
index e15ba6f2..9331980c 100644
--- a/manifests/conductor.pp
+++ b/manifests/conductor.pp
@@ -31,7 +31,7 @@ class ironic::conductor (
   $max_time_interval = '120'
 ) {
 
-  include ironic::params
+  include ::ironic::params
 
   Ironic_config<||> ~> Service['ironic-conductor']
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 579a74da..fafbac0b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -160,7 +160,7 @@ class ironic (
   $glance_api_insecure         = false
 ) {
 
-  include ironic::params
+  include ::ironic::params
 
   Package['ironic-common'] -> Ironic_config<||>
 
@@ -180,9 +180,9 @@ class ironic (
   }
 
   package { 'ironic-common':
-    ensure  => $package_ensure,
-    name    => $::ironic::params::common_package_name,
-    notify  => Exec['ironic-dbsync'],
+    ensure => $package_ensure,
+    name   => $::ironic::params::common_package_name,
+    notify => Exec['ironic-dbsync'],
   }
 
   validate_re($database_connection, '(sqlite|mysql|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')