diff --git a/lib/galaxy/web/framework/helpers/__init__.py b/lib/galaxy/web/framework/helpers/__init__.py
index 8d582a90ea7..77f6dbbea08 100644
--- a/lib/galaxy/web/framework/helpers/__init__.py
+++ b/lib/galaxy/web/framework/helpers/__init__.py
@@ -61,12 +61,12 @@ def js( *args ):
     """
     return js_helper( '/static/scripts/', *args )
     
-def handlebars( *args ):
+def templates( *args ):
     """
     Take a list of template names (no extension) and return appropriate
     string of script tags.
     """
-    return js_helper( '/static/scripts/handlebars/compiled/', *args )
+    return js_helper( '/static/scripts/templates/compiled/', *args )
     
 # Hashes
 
diff --git a/templates/base.mako b/templates/base.mako
index 97182799afc..846c88cc2b0 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -26,7 +26,7 @@
   ## <!--[if lt IE 7]>
   ## <script type='text/javascript' src="/static/scripts/IE7.js"> </script>
   ## <![endif]-->
-  ${h.js( "jquery", "galaxy.base", "libs/underscore", "libs/backbone", "libs/backbone-relational", "libs/handlebars.runtime", "backbone/ui" )}
+  ${h.js( "jquery", "galaxy.base", "libs/underscore", "libs/backbone", "libs/backbone-relational", "libs/handlebars.runtime", "mvc/ui" )}
   <script type="text/javascript">
       // Set up needed paths.
       var galaxy_paths = new GalaxyPaths({
diff --git a/templates/base_panels.mako b/templates/base_panels.mako
index 81474342268..0f5413d3472 100644
--- a/templates/base_panels.mako
+++ b/templates/base_panels.mako
@@ -47,7 +47,7 @@
     <!--[if lt IE 7]>
     ${h.js( 'IE7', 'ie7-recalc' )}
     <![endif]-->
-    ${h.js( 'jquery', 'libs/underscore', 'libs/backbone', 'libs/backbone-relational', 'libs/handlebars.runtime', 'backbone/ui' )}
+    ${h.js( 'jquery', 'libs/underscore', 'libs/backbone', 'libs/backbone-relational', 'libs/handlebars.runtime', 'mvc/ui' )}
     <script type="text/javascript">
         // Set up needed paths.
         var galaxy_paths = new GalaxyPaths({
diff --git a/templates/root/tool_menu.mako b/templates/root/tool_menu.mako
index 9bc141914cd..6d2194bd23a 100644
--- a/templates/root/tool_menu.mako
+++ b/templates/root/tool_menu.mako
@@ -16,8 +16,8 @@
 
 <%def name="javascripts()">
     ${parent.javascripts()}
-    ${h.handlebars( "tool_link", "panel_label", "panel_section", "tool_search" )}
-    ${h.js( "galaxy.base", "json2", "autocomplete_tagging", "backbone/tools" )}
+    ${h.templates( "tool_link", "panel_label", "panel_section", "tool_search" )}
+    ${h.js( "galaxy.base", "json2", "autocomplete_tagging", "mvc/tools" )}
     
     <%
         # Set up for creating tool panel.