diff --git a/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp b/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp
index ec68d198be..f0ee442b43 100644
--- a/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp
+++ b/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp
@@ -62,7 +62,7 @@ if $sahara_hash['enabled'] {
   }
 
   if $primary_controller {
-    class { 'sahara::templates::create_templates' :
+    class { 'sahara_templates::create_templates' :
       use_neutron   => $use_neutron,
       auth_user     => $access_admin['user'],
       auth_password => $access_admin['password'],
@@ -70,7 +70,7 @@ if $sahara_hash['enabled'] {
       auth_uri      => "http://${management_ip}:5000/v2.0/",
     }
 
-    Haproxy_backend_status['sahara'] -> Class['sahara::templates::create_templates']
+    Haproxy_backend_status['sahara'] -> Class['sahara_templates::create_templates']
   }
 
   Class['sahara'] -> Haproxy_backend_status['sahara']
diff --git a/deployment/puppet/sahara/lib/puppet/provider/sahara_cluster_template/ruby.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb
similarity index 100%
rename from deployment/puppet/sahara/lib/puppet/provider/sahara_cluster_template/ruby.rb
rename to deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb
diff --git a/deployment/puppet/sahara/lib/puppet/provider/sahara_node_group_template/ruby.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb
similarity index 100%
rename from deployment/puppet/sahara/lib/puppet/provider/sahara_node_group_template/ruby.rb
rename to deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb
diff --git a/deployment/puppet/sahara/lib/puppet/provider/sahara_openstack.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb
similarity index 100%
rename from deployment/puppet/sahara/lib/puppet/provider/sahara_openstack.rb
rename to deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb
diff --git a/deployment/puppet/sahara/lib/puppet/type/sahara_cluster_template.rb b/deployment/puppet/sahara_templates/lib/puppet/type/sahara_cluster_template.rb
similarity index 100%
rename from deployment/puppet/sahara/lib/puppet/type/sahara_cluster_template.rb
rename to deployment/puppet/sahara_templates/lib/puppet/type/sahara_cluster_template.rb
diff --git a/deployment/puppet/sahara/lib/puppet/type/sahara_node_group_template.rb b/deployment/puppet/sahara_templates/lib/puppet/type/sahara_node_group_template.rb
similarity index 100%
rename from deployment/puppet/sahara/lib/puppet/type/sahara_node_group_template.rb
rename to deployment/puppet/sahara_templates/lib/puppet/type/sahara_node_group_template.rb
diff --git a/deployment/puppet/sahara/manifests/templates/create_templates.pp b/deployment/puppet/sahara_templates/manifests/create_templates.pp
similarity index 99%
rename from deployment/puppet/sahara/manifests/templates/create_templates.pp
rename to deployment/puppet/sahara_templates/manifests/create_templates.pp
index c817b31660..61d193a7b7 100644
--- a/deployment/puppet/sahara/manifests/templates/create_templates.pp
+++ b/deployment/puppet/sahara_templates/manifests/create_templates.pp
@@ -1,4 +1,4 @@
-class sahara::templates::create_templates (
+class sahara_templates::create_templates (
   $auth_uri         = 'http://127.0.0.1:5000/v2.0/',
   $auth_user        = 'sahara',
   $auth_tenant      = 'services',
diff --git a/deployment/puppet/sahara_templates/spec/spec_helper.rb b/deployment/puppet/sahara_templates/spec/spec_helper.rb
new file mode 100644
index 0000000000..e7e08c20a4
--- /dev/null
+++ b/deployment/puppet/sahara_templates/spec/spec_helper.rb
@@ -0,0 +1,6 @@
+require 'puppetlabs_spec_helper/module_spec_helper'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+
diff --git a/deployment/puppet/sahara/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb
similarity index 100%
rename from deployment/puppet/sahara/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb
rename to deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb
diff --git a/deployment/puppet/sahara/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb
similarity index 100%
rename from deployment/puppet/sahara/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb
rename to deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb
diff --git a/deployment/puppet/sahara/spec/unit/puppet/type/sahara_cluster_template.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_cluster_template.rb
similarity index 100%
rename from deployment/puppet/sahara/spec/unit/puppet/type/sahara_cluster_template.rb
rename to deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_cluster_template.rb
diff --git a/deployment/puppet/sahara/spec/unit/puppet/type/sahara_node_group_template.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_node_group_template.rb
similarity index 100%
rename from deployment/puppet/sahara/spec/unit/puppet/type/sahara_node_group_template.rb
rename to deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_node_group_template.rb