diff --git a/lib/handlebars_assets/config.rb b/lib/handlebars_assets/config.rb
index 209d9ce..7321d25 100644
--- a/lib/handlebars_assets/config.rb
+++ b/lib/handlebars_assets/config.rb
@@ -94,19 +94,19 @@ def template_namespace
     end
 
     def handlebars_extensions
-      @hbs_extensions ||= ['.hbs', 'handlebars']
+      @hbs_extensions ||= ['hbs', 'handlebars']
     end
 
     def hamlbars_extensions
-      @hamlbars_extensions ||= ['.hamlbars']
+      @hamlbars_extensions ||= ['hamlbars']
     end
 
     def slimbars_extensions
-      @slimbars_extensions ||= ['.slimbars']
+      @slimbars_extensions ||= ['slimbars']
     end
 
     def ember_extensions
-      @ember_extensions ||= ['.ember']
+      @ember_extensions ||= ['ember']
     end
 
     private
diff --git a/test/handlebars_assets/tilt_handlebars_test.rb b/test/handlebars_assets/tilt_handlebars_test.rb
index 3f0c0dd..6a76142 100644
--- a/test/handlebars_assets/tilt_handlebars_test.rb
+++ b/test/handlebars_assets/tilt_handlebars_test.rb
@@ -171,7 +171,7 @@ def test_multiple_frameworks_with_ember_render
       # File without ember extension but with ember in it should compile to default namespace
       scope = make_scope root, non_ember_but_with_ember
       source = "This is {{handlebars}}"
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
       assert_equal hbs_compiled('test_member', source), template.render(scope, {})
 
       # File with ember extension should compile to ember specific namespace
@@ -183,7 +183,7 @@ def test_multiple_frameworks_with_ember_render
       # File with ember and erb extension should compile to ember specific namespace
       expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("This is {{handlebars}}");};
       scope = make_scope root, ember_ext_with_erb
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
       assert_equal expected_compiled, template.render(scope, {})
 
       # File with ember.hbs extension should compile to ember specific namespace