diff --git a/mustache-dojo/mustache.js.tpl.post b/mustache-dojo/mustache.js.tpl.post
index f659e2f..d64667f 100644
--- a/mustache-dojo/mustache.js.tpl.post
+++ b/mustache-dojo/mustache.js.tpl.post
@@ -1,5 +1,4 @@
 
-  d.mustache = function(template, view, partials) {
-    return Mustache.to_html(template, view, partials);
-  };
-})(dojo);
\ No newline at end of file
+  dojox.mustache = dojo.hitch(Mustache, "to_html");
+
+})();
\ No newline at end of file
diff --git a/mustache-dojo/mustache.js.tpl.pre b/mustache-dojo/mustache.js.tpl.pre
index ac9a308..f87f3cd 100644
--- a/mustache-dojo/mustache.js.tpl.pre
+++ b/mustache-dojo/mustache.js.tpl.pre
@@ -5,5 +5,5 @@ Shameless port of a shameless port
 See http://github.com/defunkt/mustache for more info.
 */
 
-dojo.provide("dojox.string.mustache");
-;(function(d) {
+dojo.provide("dojox.mustache._base");
+(function(){