diff --git a/awx/main/scheduler/__init__.py b/awx/main/scheduler/__init__.py
index 8c9679eaec..c0a680c7d4 100644
--- a/awx/main/scheduler/__init__.py
+++ b/awx/main/scheduler/__init__.py
@@ -34,7 +34,7 @@ from celery.task.control import inspect
 
 logger = logging.getLogger('awx.main.scheduler')
 
-class Scheduler():
+class TaskManager():
     def __init__(self):
         self.graph = DependencyGraph()
         self.capacity_total = 200
diff --git a/awx/main/scheduler/tasks.py b/awx/main/scheduler/tasks.py
index 2b35b5ab64..eb9c7691a7 100644
--- a/awx/main/scheduler/tasks.py
+++ b/awx/main/scheduler/tasks.py
@@ -11,7 +11,7 @@ from celery import task
 
 # AWX
 from awx.main.models import Instance
-from awx.main.scheduler import Scheduler
+from awx.main.scheduler import TaskManager 
 
 logger = logging.getLogger('awx.main.scheduler')
 
@@ -21,15 +21,15 @@ logger = logging.getLogger('awx.main.scheduler')
 
 @task
 def run_job_launch(job_id):
-    Scheduler().schedule()
+    TaskManager().schedule()
 
 @task
 def run_job_complete(job_id):
-    Scheduler().schedule()
+    TaskManager().schedule()
 
 @task
 def run_scheduler():
-    Scheduler().schedule()
+    TaskManager().schedule()
 
 @task
 def run_fail_inconsistent_running_jobs():
@@ -37,7 +37,7 @@ def run_fail_inconsistent_running_jobs():
         # Lock
         try:
             Instance.objects.select_for_update(nowait=True).all()[0]
-            scheduler = Scheduler()
+            scheduler = TaskManager()
             active_tasks = scheduler.get_active_tasks()
 
             if active_tasks is None:
diff --git a/awx/main/tests/unit/scheduler/conftest.py b/awx/main/tests/unit/scheduler/conftest.py
index cec68b1ef7..6b07649fd0 100644
--- a/awx/main/tests/unit/scheduler/conftest.py
+++ b/awx/main/tests/unit/scheduler/conftest.py
@@ -13,7 +13,7 @@ from awx.main.scheduler.partial import (
     InventoryUpdateDict,
     InventorySourceDict,
 )
-from awx.main.scheduler import Scheduler
+from awx.main.scheduler import TaskManager
 
 
 @pytest.fixture
@@ -23,7 +23,7 @@ def epoch():
 @pytest.fixture
 def scheduler_factory(mocker, epoch):
     def fn(tasks=[], inventory_sources=[], latest_project_updates=[], latest_inventory_updates=[], create_project_update=None, create_inventory_update=None):
-        sched = Scheduler()
+        sched = TaskManager()
         sched.capacity_total = 999999999
 
         sched.graph.get_now = lambda: epoch