diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index eebb1dbc64c..f19c5b930c9 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -214,7 +214,7 @@ Discourse.Category.reopenClass({
     return Discourse.Site.currentProp('sortedCategories');
   },
 
-  map: function() {
+  idMap: function() {
     return Discourse.Site.currentProp('categoriesById');
   },
 
@@ -225,7 +225,7 @@ Discourse.Category.reopenClass({
   },
 
   findById: function(id) {
-    return Discourse.Category.map()[id];
+    return Discourse.Category.idMap()[id];
   },
 
   findByIds: function(ids){
diff --git a/test/javascripts/models/category_test.js b/test/javascripts/models/category_test.js
index d7d64e4b0df..6d9f7c0ed32 100644
--- a/test/javascripts/models/category_test.js
+++ b/test/javascripts/models/category_test.js
@@ -45,7 +45,7 @@ test('findByIds', function() {
     2: Discourse.Category.create({id: 2})
   };
 
-  this.stub(Discourse.Category, 'map').returns(categories);
+  this.stub(Discourse.Category, 'idMap').returns(categories);
   deepEqual(Discourse.Category.findByIds([1,2,3]), _.values(categories));
 });