diff --git a/doc/source/internals.rst b/doc/source/internals.rst
index 762eb6b56c..754661540a 100644
--- a/doc/source/internals.rst
+++ b/doc/source/internals.rst
@@ -17,7 +17,7 @@ basic organizational structure that everything else hangs off.
 .. autoclass:: zuul.model.Pipeline
 
 Pipelines have a configured
-:py:class:`Manager <zuul.manager.BasePipelineManager>` which controlls how
+:py:class:`~zuul.manager.PipelineManager` which controlls how
 the :py:class:`Change <zuul.model.Changeish>` objects are enqueued and
 processed.
 
@@ -25,7 +25,7 @@ There are currently two,
 :py:class:`~zuul.manager.dependent.DependentPipelineManager` and
 :py:class:`~zuul.manager.independent.IndependentPipelineManager`
 
-.. autoclass:: zuul.manager.BasePipelineManager
+.. autoclass:: zuul.manager.PipelineManager
 .. autoclass:: zuul.manager.dependent.DependentPipelineManager
 .. autoclass:: zuul.manager.independent.IndependentPipelineManager
 
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py
index 4a4fa0a637..cd2caa8e61 100644
--- a/zuul/manager/__init__.py
+++ b/zuul/manager/__init__.py
@@ -42,10 +42,10 @@ class StaticChangeQueueContextManager(object):
         pass
 
 
-class BasePipelineManager(object):
+class PipelineManager(object):
     """Abstract Base Class for enqueing and processing Changes in a Pipeline"""
 
-    log = logging.getLogger("zuul.BasePipelineManager")
+    log = logging.getLogger("zuul.PipelineManager")
 
     def __init__(self, sched, pipeline):
         self.sched = sched
diff --git a/zuul/manager/dependent.py b/zuul/manager/dependent.py
index d175c6791d..686a5938a6 100644
--- a/zuul/manager/dependent.py
+++ b/zuul/manager/dependent.py
@@ -13,10 +13,10 @@
 import logging
 
 from zuul import model
-from zuul.manager import BasePipelineManager, StaticChangeQueueContextManager
+from zuul.manager import PipelineManager, StaticChangeQueueContextManager
 
 
-class DependentPipelineManager(BasePipelineManager):
+class DependentPipelineManager(PipelineManager):
     """PipelineManager for handling interrelated Changes.
 
     The DependentPipelineManager puts Changes that share a Pipeline
diff --git a/zuul/manager/independent.py b/zuul/manager/independent.py
index ca650185e8..d3b6b0ddc2 100644
--- a/zuul/manager/independent.py
+++ b/zuul/manager/independent.py
@@ -13,10 +13,10 @@
 import logging
 
 from zuul import model
-from zuul.manager import BasePipelineManager, DynamicChangeQueueContextManager
+from zuul.manager import PipelineManager, DynamicChangeQueueContextManager
 
 
-class IndependentPipelineManager(BasePipelineManager):
+class IndependentPipelineManager(PipelineManager):
     """PipelineManager that puts every Change into its own ChangeQueue."""
 
     log = logging.getLogger("zuul.IndependentPipelineManager")