Avoid the Base* prefix, now that the class is in a different module

src/AccessControl/AccessControl.txt

@@ -166,7 +166,7 @@ Mail Host
 
 
 To support the architecture, developers must derive an
-object from the AccessControl.rolemanager.BaseRoleManager mixin class,
+object from the AccessControl.rolemanager.RoleManager mixin class,
 and define in their class an __ac_permissions__ attribute.
 
 This should be a tuple of tuples, where each tuple represents

src/AccessControl/Role.py

@@ -17,7 +17,6 @@
 from .rolemanager import DEFAULTMAXLISTUSERS
 from .rolemanager import _isBeingUsedAsAMethod
 from .rolemanager import _isNotBeingUsedAsAMethod
-from .rolemanager import BaseRoleManager
 from .rolemanager import reqattr
 from .rolemanager import classattr
 from .rolemanager import instance_dict
@@ -29,6 +28,6 @@ from .rolemanager import gather_permissions
 from zope.deferredimport import deprecated
 deprecated("RoleManager is no longer part of AccessControl, please "
            "depend on Zope2 and import from OFS.role or use the "
-           "BaseRoleManager class from AccessControl.rolemanager.",
+           "RoleManager class from AccessControl.rolemanager.",
     RoleManager = 'OFS.role:RoleManager',
 )

src/AccessControl/rolemanager.py

@@ -40,7 +40,7 @@ def _isNotBeingUsedAsAMethod(self):
     return not aq_get(self, '_isBeingUsedAsAMethod_', 0)
 
 
-class BaseRoleManager(Base, RoleManager):
+class RoleManager(Base, RoleManager):
     """An object that has configurable permissions"""
 
     implements(IRoleManager)
@@ -436,7 +436,7 @@ class BaseRoleManager(Base, RoleManager):
         d.sort()
         return d
 
-InitializeClass(BaseRoleManager)
+InitializeClass(RoleManager)
 
 
 def reqattr(request, attr):

src/AccessControl/tests/testRole.py

@@ -5,10 +5,10 @@ class TestRoleManager(unittest.TestCase):
 
     def test_interfaces(self):
         from AccessControl.interfaces import IRoleManager
-        from AccessControl.rolemanager import BaseRoleManager
+        from AccessControl.rolemanager import RoleManager
         from zope.interface.verify import verifyClass
 
-        verifyClass(IRoleManager, BaseRoleManager)
+        verifyClass(IRoleManager, RoleManager)
 
 
 def test_suite():

src/OFS/role.py

@@ -19,7 +19,7 @@ from App.special_dtml import DTMLFile
 
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
-from AccessControl.rolemanager import BaseRoleManager
+from AccessControl.rolemanager import RoleManager as BaseRoleManager
 from AccessControl.rolemanager import reqattr
 from AccessControl.Permission import Permission
 from AccessControl.Permissions import change_permissions