diff --git a/spec/unit/puppetx/puppetlabs/strings/yard/defined_type_handler_spec.rb b/spec/unit/puppetx/puppetlabs/strings/yard/defined_type_handler_spec.rb
index ce42c2c..f491d01 100644
--- a/spec/unit/puppetx/puppetlabs/strings/yard/defined_type_handler_spec.rb
+++ b/spec/unit/puppetx/puppetlabs/strings/yard/defined_type_handler_spec.rb
@@ -3,7 +3,7 @@ require 'puppetx/puppetlabs/strings/yard/handlers/defined_type_handler'
 require 'strings_spec/parsing'
 
 
-describe "DefinedTypeHanlder" do
+describe Puppetx::PuppetLabs::Strings::YARD::Handlers::DefinedTypeHandler do
   include StringsSpec::Parsing
 
   def the_definedtype()
diff --git a/spec/unit/puppetx/puppetlabs/strings/yard/host_class_handler_spec.rb b/spec/unit/puppetx/puppetlabs/strings/yard/host_class_handler_spec.rb
index 2897f72..3156962 100644
--- a/spec/unit/puppetx/puppetlabs/strings/yard/host_class_handler_spec.rb
+++ b/spec/unit/puppetx/puppetlabs/strings/yard/host_class_handler_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'puppetx/puppetlabs/strings/yard/handlers/host_class_handler'
 require 'strings_spec/parsing'
 
-describe "HostClassDefintion" do
+describe Puppetx::PuppetLabs::Strings::YARD::Handlers::HostClassHandler do
   include StringsSpec::Parsing
 
   def the_hostclass()
diff --git a/spec/unit/puppetx/puppetlabs/strings/yard/parser_function_handler_spec.rb b/spec/unit/puppetx/puppetlabs/strings/yard/puppet_3x_function_handler_spec.rb
similarity index 94%
rename from spec/unit/puppetx/puppetlabs/strings/yard/parser_function_handler_spec.rb
rename to spec/unit/puppetx/puppetlabs/strings/yard/puppet_3x_function_handler_spec.rb
index dd2e1f1..b20f049 100644
--- a/spec/unit/puppetx/puppetlabs/strings/yard/parser_function_handler_spec.rb
+++ b/spec/unit/puppetx/puppetlabs/strings/yard/puppet_3x_function_handler_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'puppetx/puppetlabs/strings/yard/handlers/puppet_3x_function_handler'
 require 'strings_spec/parsing'
 
-describe "Puppet3xFunctionHanlder" do
+describe Puppetx::PuppetLabs::Strings::YARD::Handlers::Puppet3xFunctionHandler do
   include StringsSpec::Parsing
 
   def the_method()
diff --git a/spec/unit/puppetx/puppetlabs/strings/yard/future_parser_function_handler_spec.rb b/spec/unit/puppetx/puppetlabs/strings/yard/puppet_4x_function_handler_spec.rb
similarity index 95%
rename from spec/unit/puppetx/puppetlabs/strings/yard/future_parser_function_handler_spec.rb
rename to spec/unit/puppetx/puppetlabs/strings/yard/puppet_4x_function_handler_spec.rb
index c82b552..a8dc853 100644
--- a/spec/unit/puppetx/puppetlabs/strings/yard/future_parser_function_handler_spec.rb
+++ b/spec/unit/puppetx/puppetlabs/strings/yard/puppet_4x_function_handler_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'puppetx/puppetlabs/strings/yard/handlers/puppet_4x_function_handler'
 require 'strings_spec/parsing'
 
-describe "Pupet4xFunctionHandler" do
+describe Puppetx::PuppetLabs::Strings::YARD::Handlers::Puppet4xFunctionHandler do
   include StringsSpec::Parsing
 
   def the_method()