diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js
index 4f100a4f..9e17cad4 100644
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -188,8 +188,6 @@ function templateDefaults(template) {
 //        Return template identifier (only valid for given user)
 //
 TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
-    var self = this;
-
     template = templateDefaults(template);
 
     var invalidError = this._checkInvalidTemplate(template);
@@ -197,7 +195,6 @@ TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
         return callback(invalidError);
     }
 
-    var templateName = template.name;
     var userTemplatesKey = this.key_usr_tpl({ owner:owner });
     var limit = this._userTemplateLimit();
 
@@ -205,7 +202,7 @@ TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
         return 0;
     }
 
-    self._redisCmd('HLEN', [ userTemplatesKey ], (err, numberOfTemplates) => {
+    this._redisCmd('HLEN', [ userTemplatesKey ], (err, numberOfTemplates) => {
         if (err) {
             return callback(err);
         }
@@ -217,18 +214,19 @@ TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
             limitReachedError.http_status = 409;
             return callback(limitReachedError);
         }
-        self._redisCmd('HSETNX', [ userTemplatesKey, templateName, JSON.stringify(template) ], (err, wasSet) => {
+
+        this._redisCmd('HSETNX', [ userTemplatesKey, template.name, JSON.stringify(template) ], (err, wasSet) => {
             if (err) {
                 return callback(err);
             }
 
             if (!wasSet) {
-                const ownerExistsError = new Error(`Template '${templateName}' of user '${owner}' already exists`);
+                var ownerExistsError = new Error(`Template '${template.name}' of user '${owner}' already exists`);
                 return callback(ownerExistsError);
             }
 
-            self.emit('add', owner, templateName, template);
-            callback(err, templateName, template);
+            this.emit('add', owner, template.name, template);
+            callback(err, template.name, template);
         });
     });
 };