diff --git a/awx/main/constants.py b/awx/main/constants.py
index e8ac403723..f2af99d167 100644
--- a/awx/main/constants.py
+++ b/awx/main/constants.py
@@ -14,7 +14,7 @@ __all__ = [
     'STANDARD_INVENTORY_UPDATE_ENV',
 ]
 
-CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'tower', 'insights')
+CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'controller', 'insights')
 PRIVILEGE_ESCALATION_METHODS = [
     ('sudo', _('Sudo')),
     ('su', _('Su')),
diff --git a/awx/main/managers.py b/awx/main/managers.py
index 955d730213..f620555df1 100644
--- a/awx/main/managers.py
+++ b/awx/main/managers.py
@@ -33,7 +33,7 @@ class HostManager(models.Manager):
          - Only consider results that are unique
          - Return the count of this query
         """
-        return self.order_by().exclude(inventory_sources__source='tower').values('name').distinct().count()
+        return self.order_by().exclude(inventory_sources__source='controller').values('name').distinct().count()
 
     def org_active_count(self, org_id):
         """Return count of active, unique hosts used by an organization.
@@ -45,7 +45,7 @@ class HostManager(models.Manager):
          - Only consider results that are unique
          - Return the count of this query
         """
-        return self.order_by().exclude(inventory_sources__source='tower').filter(inventory__organization=org_id).values('name').distinct().count()
+        return self.order_by().exclude(inventory_sources__source='controller').filter(inventory__organization=org_id).values('name').distinct().count()
 
     def get_queryset(self):
         """When the parent instance of the host query set has a `kind=smart` and a `host_filter`
diff --git a/awx/main/tests/data/inventory/plugins/tower/env.json b/awx/main/tests/data/inventory/plugins/controller/env.json
similarity index 100%
rename from awx/main/tests/data/inventory/plugins/tower/env.json
rename to awx/main/tests/data/inventory/plugins/controller/env.json
diff --git a/awx/main/tests/functional/models/test_inventory.py b/awx/main/tests/functional/models/test_inventory.py
index c7303367b3..4edbe54fa1 100644
--- a/awx/main/tests/functional/models/test_inventory.py
+++ b/awx/main/tests/functional/models/test_inventory.py
@@ -104,7 +104,7 @@ class TestActiveCount:
 
     def test_active_count_minus_tower(self, inventory):
         inventory.hosts.create(name='locally-managed-host')
-        source = inventory.inventory_sources.create(name='tower-source', source='tower')
+        source = inventory.inventory_sources.create(name='tower-source', source='controller')
         source.hosts.create(name='remotely-managed-host', inventory=inventory)
         assert Host.objects.active_count() == 1
 
@@ -210,7 +210,7 @@ class TestInventorySourceInjectors:
             ('rhv', 'ovirt.ovirt.ovirt'),
             ('satellite6', 'theforeman.foreman.foreman'),
             ('insights', 'redhatinsights.insights.insights'),
-            ('tower', 'awx.awx.tower'),
+            ('controller', 'awx.awx.tower'),
         ],
     )
     def test_plugin_proper_names(self, source, proper_name):
diff --git a/awx/main/tests/functional/test_inventory_source_injectors.py b/awx/main/tests/functional/test_inventory_source_injectors.py
index f011e51104..f2b9f2d3e1 100644
--- a/awx/main/tests/functional/test_inventory_source_injectors.py
+++ b/awx/main/tests/functional/test_inventory_source_injectors.py
@@ -62,7 +62,7 @@ def fake_credential_factory():
         for var in var_specs.keys():
             inputs[var] = generate_fake_var(var_specs[var])
 
-        if source == 'tower':
+        if source == 'controller':
             inputs.pop('oauth_token')  # mutually exclusive with user/pass
 
         return Credential.objects.create(credential_type=ct, inputs=inputs)
diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py
index b226f72ee2..cf0f95a437 100644
--- a/awx/main/tests/unit/test_tasks.py
+++ b/awx/main/tests/unit/test_tasks.py
@@ -1778,8 +1778,8 @@ class TestInventoryUpdateCredentials(TestJobExecution):
     def test_tower_source(self, verify, inventory_update, private_data_dir, mocker):
         task = tasks.RunInventoryUpdate()
         task.instance = inventory_update
-        tower = CredentialType.defaults['tower']()
-        inventory_update.source = 'tower'
+        tower = CredentialType.defaults['controller']()
+        inventory_update.source = 'controller'
         inputs = {'host': 'https://tower.example.org', 'username': 'bob', 'password': 'secret', 'verify_ssl': verify}
 
         def get_cred():
@@ -1806,8 +1806,8 @@ class TestInventoryUpdateCredentials(TestJobExecution):
     def test_tower_source_ssl_verify_empty(self, inventory_update, private_data_dir, mocker):
         task = tasks.RunInventoryUpdate()
         task.instance = inventory_update
-        tower = CredentialType.defaults['tower']()
-        inventory_update.source = 'tower'
+        tower = CredentialType.defaults['controller']()
+        inventory_update.source = 'controller'
         inputs = {
             'host': 'https://tower.example.org',
             'username': 'bob',