diff --git a/html-imports.js b/html-imports.js
index 565672b..f560629 100644
--- a/html-imports.js
+++ b/html-imports.js
@@ -27,10 +27,10 @@ var script = document.querySelector('script[src*="' + thisFile + '"]');
 var src = script.attributes.src.value;
 var basePath = src.slice(0, src.indexOf(thisFile));
 
-if (!window.Loader) {
+if (!window.PolymerLoader) {
   var path = basePath + 'tools/loader/loader.js';
   document.write('<script src="' + path + '"></script>');
 }
-document.write('<script>Loader.load("' + scopeName + '")</script>');
+document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');
 
 })();
diff --git a/tools b/tools
index 313f752..03ce077 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 313f7524ce37689ebfb60c81f7bda721535467cf
+Subproject commit 03ce077cc6676eda5d87baa185a1519c273430c5