diff --git a/api/router_static.go b/api/router_static.go
index 59038b7..eb9be62 100644
--- a/api/router_static.go
+++ b/api/router_static.go
@@ -49,8 +49,8 @@ func initStaticRouter(router *mux.Router) error {
 
 			prefix := ""
 			if dir == "/js" {
-				prefix = "window.commento_origin='" + os.Getenv("ORIGIN") + "';\n"
-				prefix += "window.commento_cdn='" + os.Getenv("CDN_PREFIX") + "';\n"
+				prefix = "window.commentoOrigin='" + os.Getenv("ORIGIN") + "';\n"
+				prefix += "window.commentoCdn='" + os.Getenv("CDN_PREFIX") + "';\n"
 			}
 
 			gzip := (os.Getenv("GZIP_STATIC") == "true")
diff --git a/frontend/js/commento.js b/frontend/js/commento.js
index 202c302..93959f2 100644
--- a/frontend/js/commento.js
+++ b/frontend/js/commento.js
@@ -50,8 +50,8 @@
   var ID_FOOTER = "commento-footer";
 
 
-  var origin = global.commento_origin;
-  var cdn = global.commento_cdn;
+  var origin = global.commentoOrigin;
+  var cdn = global.commentoCdn;
   var root = null;
   var cssOverride = undefined;
   var isAuthenticated = false;
diff --git a/frontend/js/dashboard-domain.js b/frontend/js/dashboard-domain.js
index 5855674..bba3709 100644
--- a/frontend/js/dashboard-domain.js
+++ b/frontend/js/dashboard-domain.js
@@ -42,7 +42,7 @@
     }
 
     global.buttonDisable("#add-site-button");
-    global.post(global.commento_origin + "/api/domain/new", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/domain/new", json, function(resp) {
       global.buttonEnable("#add-site-button");
 
       $("#new-domain-name").val("");
@@ -69,7 +69,7 @@
       session: global.cookieGet("session"),
     };
 
-    global.post(global.commento_origin + "/api/domain/list", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/domain/list", json, function(resp) {
       if (!resp.success) {
         global.globalErrorShow(resp.message);
         return;
@@ -111,7 +111,7 @@
       domain: domain,
     };
 
-    global.post(global.commento_origin + "/api/domain/update", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/domain/update", json, function(resp) {
       if (callback !== undefined)
         callback(resp.success);
 
@@ -130,7 +130,7 @@
       domain: domain,
     };
 
-    global.post(global.commento_origin + "/api/domain/delete", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/domain/delete", json, function(resp) {
       if (!resp.success) {
         global.globalErrorShow(resp.message);
         return;
diff --git a/frontend/js/dashboard-import.js b/frontend/js/dashboard-import.js
index 8bdaf07..2f8e4aa 100644
--- a/frontend/js/dashboard-import.js
+++ b/frontend/js/dashboard-import.js
@@ -18,7 +18,7 @@
     }
 
     global.buttonDisable("#disqus-import-button");
-    global.post(global.commento_origin + "/api/domain/import/disqus", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/domain/import/disqus", json, function(resp) {
       global.buttonEnable("#disqus-import-button");
 
       if (!resp.success) {
diff --git a/frontend/js/dashboard-installation.js b/frontend/js/dashboard-installation.js
index 58559f2..d50a728 100644
--- a/frontend/js/dashboard-installation.js
+++ b/frontend/js/dashboard-installation.js
@@ -6,7 +6,7 @@
 
     var html = '' +
                '<div id="commento"></div>\n' +
-               '<script src="' + window.commento_cdn + '/js/commento.js"><\/script>\n' +
+               '<script src="' + window.commentoCdn + '/js/commento.js"><\/script>\n' +
                '';
 
     $("#code-div").text(html);
diff --git a/frontend/js/dashboard-moderation.js b/frontend/js/dashboard-moderation.js
index ca04ec5..598f68e 100644
--- a/frontend/js/dashboard-moderation.js
+++ b/frontend/js/dashboard-moderation.js
@@ -29,7 +29,7 @@
     if (idx == -1) {
       data.domains[data.cd].moderators.push({"email": email, "timeAgo": "just now"});
       global.buttonDisable("#new-mod-button");
-      global.post(global.commento_origin + "/api/domain/moderator/new", json, function(resp) {
+      global.post(global.commentoOrigin + "/api/domain/moderator/new", json, function(resp) {
         global.buttonEnable("#new-mod-button");
 
         if (!resp.success) {
@@ -68,7 +68,7 @@
 
     if (idx != -1) {
       data.domains[data.cd].moderators.splice(idx, 1);
-      global.post(global.commento_origin + "/api/domain/moderator/delete", json, function(resp) {
+      global.post(global.commentoOrigin + "/api/domain/moderator/delete", json, function(resp) {
         if (!resp.success) {
           global.globalErrorShow(resp.message);
           return
diff --git a/frontend/js/dashboard-statistics.js b/frontend/js/dashboard-statistics.js
index 235d91e..af99e6b 100644
--- a/frontend/js/dashboard-statistics.js
+++ b/frontend/js/dashboard-statistics.js
@@ -43,7 +43,7 @@
     }
 
     $(".view").hide();
-    post(global.commento_origin + "/api/domain/statistics", json, function(resp) {
+    post(global.commentoOrigin + "/api/domain/statistics", json, function(resp) {
       $("#statistics-view").show();
 
       if (!resp.success) {
diff --git a/frontend/js/forgot.js b/frontend/js/forgot.js
index d1d872c..44d80a2 100644
--- a/frontend/js/forgot.js
+++ b/frontend/js/forgot.js
@@ -16,7 +16,7 @@
     };
 
     global.buttonDisable("#reset-button");
-    global.post(global.commento_origin + "/api/owner/send-reset-hex", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/owner/send-reset-hex", json, function(resp) {
       global.buttonEnable("#reset-button");
 
       global.textSet("#err", "");
diff --git a/frontend/js/login.js b/frontend/js/login.js
index d36fbc6..3fdfd5c 100644
--- a/frontend/js/login.js
+++ b/frontend/js/login.js
@@ -57,7 +57,7 @@
     };
 
     global.buttonDisable("#login-button");
-    global.post(global.commento_origin + "/api/owner/login", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/owner/login", json, function(resp) {
       global.buttonEnable("#login-button");
 
       if (!resp.success) {
diff --git a/frontend/js/reset.js b/frontend/js/reset.js
index 241ce41..3b55bbb 100644
--- a/frontend/js/reset.js
+++ b/frontend/js/reset.js
@@ -21,7 +21,7 @@
     };
 
     global.buttonDisable("#reset-button");
-    global.post(global.commento_origin + "/api/owner/reset-password", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/owner/reset-password", json, function(resp) {
       global.buttonEnable("#reset-button");
 
       global.textSet("#err", "");
diff --git a/frontend/js/self.js b/frontend/js/self.js
index cd2c161..bd53f74 100644
--- a/frontend/js/self.js
+++ b/frontend/js/self.js
@@ -6,7 +6,7 @@
       "session": global.cookieGet("session"),
     };
 
-    global.post(global.commento_origin + "/api/owner/self", json, function(resp) {
+    global.post(global.commentoOrigin + "/api/owner/self", json, function(resp) {
       if (!resp.success || !resp.loggedIn) {
         document.location = "/login";
         return;
diff --git a/frontend/js/signup.js b/frontend/js/signup.js
index 6a84b88..e248139 100644
--- a/frontend/js/signup.js
+++ b/frontend/js/signup.js
@@ -25,7 +25,7 @@
     };
 
     global.buttonDisable("#signup-button");
-    post(global.commento_origin + "/api/owner/new", json, function(resp) {
+    post(global.commentoOrigin + "/api/owner/new", json, function(resp) {
       global.buttonEnable("#signup-button")
 
       if (!resp.success) {