diff --git a/lib/models/acl.js b/lib/models/acl.js
index d7f18b6f..b14ebabc 100644
--- a/lib/models/acl.js
+++ b/lib/models/acl.js
@@ -356,7 +356,7 @@ ACL.prototype.debug = function() {
  * @property {String} accessType The access type
  * @param {Function} callback
  */
-ACL.checkAccess = function (context, callback) {
+ACL.checkAccessForContext = function (context, callback) {
   if(!(context instanceof AccessContext)) {
     context = new AccessContext(context);
   }
@@ -422,7 +422,7 @@ ACL.checkAccess = function (context, callback) {
       if(resolved && resolved.permission === ACL.DEFAULT) {
         resolved.permission = (model && model.settings.defaultPermission) || ACL.ALLOW;
       }
-      debug('checkAccess() returns: %j', resolved);
+      debug('checkAccessForContext() returns: %j', resolved);
       callback && callback(null, resolved);
     });
   });
@@ -455,7 +455,7 @@ ACL.checkAccessForToken = function (token, model, modelId, method, callback) {
 
   context.debug();
 
-  this.checkAccess(context, function (err, access) {
+  this.checkAccessForContext(context, function (err, access) {
     if (err) {
       callback && callback(err);
       return;
diff --git a/test/acl.test.js b/test/acl.test.js
index 488638e7..ce75a12b 100644
--- a/test/acl.test.js
+++ b/test/acl.test.js
@@ -268,7 +268,7 @@ describe('security ACLs', function () {
 
               log('ACL 2: ', acl.toObject());
 
-              ACL.checkAccess({
+              ACL.checkAccessForContext({
                 principals: [
                   {type: ACL.USER, id: userId}
                 ],
@@ -279,7 +279,7 @@ describe('security ACLs', function () {
                 assert(!err && access.permission === ACL.ALLOW);
               });
 
-              ACL.checkAccess({
+              ACL.checkAccessForContext({
                 principals: [
                   {type: ACL.ROLE, id: Role.EVERYONE}
                 ],