diff --git a/.msync.yml b/.msync.yml
index 4c6463a58..466514a60 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.5.1'
+modulesync_config_version: '2.6.1'
diff --git a/.travis.yml b/.travis.yml
index 2b6625cc6..3168bc507 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,9 @@ dist: xenial
 language: ruby
 cache: bundler
 before_install:
-  - sh ./.travis/setup.sh
+  - gem update --system
+  - gem update bundler
+  - bundle --version
 script:
   - 'bundle exec rake $CHECK'
 matrix:
diff --git a/Dockerfile b/Dockerfile
index 27a33cf68..67048bb40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.1
+FROM ruby:2.5.3
 
 WORKDIR /opt/puppet
 
diff --git a/Gemfile b/Gemfile
index 9524f1ab4..24dbb7ff6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'puppetlabs_spec_helper', '>= 2.11.0',                        :require => false
+  gem 'puppetlabs_spec_helper', '>= 2.14.0',                        :require => false
   gem 'rspec-puppet-facts', '>= 1.8.0',                             :require => false
   gem 'rspec-puppet-utils',                                         :require => false
   gem 'puppet-lint-leading_zero-check',                             :require => false
@@ -20,6 +20,7 @@ group :test do
   gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
   gem 'puppet-lint-unquoted_string-check',                          :require => false
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
+  gem 'puppet-lint-absolute_classname-check',                       :require => false
   gem 'metadata-json-lint',                                         :require => false
   gem 'redcarpet',                                                  :require => false
   gem 'rubocop', '~> 0.49.1',                                       :require => false
@@ -64,7 +65,7 @@ group :release do
   gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator'
   gem 'puppet-blacksmith',           :require => false
   gem 'voxpupuli-release',           :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
-  gem 'puppet-strings', '>= 1.0',    :require => false
+  gem 'puppet-strings', '>= 2.2',    :require => false
 end
 
 
diff --git a/Rakefile b/Rakefile
index 13ef17c01..09701d0f2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,19 +3,12 @@ require 'puppetlabs_spec_helper/rake_tasks'
 # load optional tasks for releases
 # only available if gem group releases is installed
 begin
-  require 'puppet_blacksmith/rake_tasks'
   require 'voxpupuli/release/rake_tasks'
-  require 'puppet-strings/tasks'
 rescue LoadError
 end
 
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_140chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+PuppetLint.configuration.absolute_classname_reverse = true
 
 exclude_paths = %w(
   pkg/**/*
@@ -28,8 +21,7 @@ PuppetSyntax.exclude_paths = exclude_paths
 
 desc 'Auto-correct puppet-lint offenses'
 task 'lint:auto_correct' do
-  PuppetLint.configuration.fix = true
-  Rake::Task[:lint].invoke
+  Rake::Task[:lint_fix].invoke
 end
 
 desc 'Run acceptance tests'
@@ -37,10 +29,8 @@ RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
 end
 
-desc 'Run tests release_checks'
-task test: [
-  :release_checks,
-]
+desc 'Run tests'
+task test: [:release_checks]
 
 namespace :check do
   desc 'Check for trailing whitespace'
@@ -69,25 +59,10 @@ task test_with_coveralls: [:test] do
   end
 end
 
-desc "Print supported beaker sets"
-task 'beaker_sets', [:directory] do |t, args|
-  directory = args[:directory]
-
-  metadata = JSON.load(File.read('metadata.json'))
-
-  (metadata['operatingsystem_support'] || []).each do |os|
-    (os['operatingsystemrelease'] || []).each do |release|
-      if directory
-        beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
-      else
-        beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
-      end
-
-      filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
-
-      puts beaker_set if File.exists? filename
-    end
-  end
+desc 'Generate REFERENCE.md'
+task :reference, [:debug, :backtrace] do |t, args|
+  patterns = ''
+  Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
 end
 
 begin
diff --git a/examples/init.pp b/examples/init.pp
index 91dce9973..41cc19dec 100644
--- a/examples/init.pp
+++ b/examples/init.pp
@@ -4,6 +4,6 @@
 # managed by the nginx class.
 node default {
   notify { 'before': }
-  -> class { '::nginx': }
+  -> class { 'nginx': }
   -> notify { 'last': }
 }
diff --git a/examples/location_alias.pp b/examples/location_alias.pp
index afc925a69..fdaa8cc70 100644
--- a/examples/location_alias.pp
+++ b/examples/location_alias.pp
@@ -1,6 +1,6 @@
-include ::nginx
+include nginx
 
-::nginx::resource::location { 'www.test.com-alias':
+nginx::resource::location { 'www.test.com-alias':
     ensure         => present,
     location       => '/some/url',
     location_alias => '/new/url/',
diff --git a/examples/location_params.pp b/examples/location_params.pp
index 4eaf2fd78..88ba452f0 100644
--- a/examples/location_params.pp
+++ b/examples/location_params.pp
@@ -1,6 +1,6 @@
-include ::nginx
+include nginx
 
-::nginx::resource::location { 'www.test.com-params':
+nginx::resource::location { 'www.test.com-params':
     ensure        => present,
     location      => '/some/url',
     server        => 'www.test.com',
diff --git a/examples/server.pp b/examples/server.pp
index 59c996e1d..3e74ebc80 100644
--- a/examples/server.pp
+++ b/examples/server.pp
@@ -1,12 +1,12 @@
-include ::nginx
+include nginx
 
-::nginx::resource::server { 'test.local test':
+nginx::resource::server { 'test.local test':
   ensure      => present,
   ipv6_enable => true,
   proxy       => 'http://proxypass',
 }
 
-::nginx::resource::server { 'test.local:8080':
+nginx::resource::server { 'test.local:8080':
   ensure      => present,
   listen_port => 8080,
   server_name => ['test.local test'],
diff --git a/examples/server_ssl.pp b/examples/server_ssl.pp
index fc34f29b8..7578bd579 100644
--- a/examples/server_ssl.pp
+++ b/examples/server_ssl.pp
@@ -1,6 +1,6 @@
-include ::nginx
+include nginx
 
-::nginx::resource::server { 'test3.local test3':
+nginx::resource::server { 'test3.local test3':
   ensure          => present,
   www_root        => '/var/www/nginx-default',
   ssl             => true,
@@ -9,7 +9,7 @@
   ssl_key         => 'puppet:///modules/sslkey/whildcard_mydomain.key',
 }
 
-::nginx::resource::server { 'test2.local test2':
+nginx::resource::server { 'test2.local test2':
   ensure   => present,
   www_root => '/var/www/nginx-default',
   ssl      => true,
@@ -17,14 +17,14 @@
   ssl_key  => 'puppet:///modules/sslkey/whildcard_mydomain.key',
 }
 
-::nginx::resource::location { 'test2.local-bob':
+nginx::resource::location { 'test2.local-bob':
   ensure   => present,
   www_root => '/var/www/bob',
   location => '/bob',
   server   => 'test2.local test2',
 }
 
-::nginx::resource::location { 'test3.local-bob':
+nginx::resource::location { 'test3.local-bob':
   ensure   => present,
   www_root => '/var/www/bob',
   location => '/bob',
diff --git a/examples/upstream.pp b/examples/upstream.pp
index cd3ecc5e5..053b97e1b 100644
--- a/examples/upstream.pp
+++ b/examples/upstream.pp
@@ -1,6 +1,6 @@
-include ::nginx
+include nginx
 
-::nginx::resource::upstream { 'proxypass':
+nginx::resource::upstream { 'proxypass':
   ensure  => present,
   members => {
     'localhost:3001' => {