diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index c78c54b01a..edfb8e848e 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -816,7 +816,7 @@ class RunInventoryUpdate(BaseTask):
             args.extend(['--enabled-var', 'ec2_state'])
             args.extend(['--enabled-value', 'running'])
             #args.extend(['--instance-id', 'ec2_id'])
-        elif inventory_source.source in == 'rax':
+        elif inventory_source.source == 'rax':
             rax_path = self.get_path_to('..', 'plugins', 'inventory', 'rax.py')
             args.append(rax_path)
             args.extend(['--enabled-var', 'rax_status'])
diff --git a/awx/ui/static/js/forms/Groups.js b/awx/ui/static/js/forms/Groups.js
index 0ba90d67bd..54f8956df2 100644
--- a/awx/ui/static/js/forms/Groups.js
+++ b/awx/ui/static/js/forms/Groups.js
@@ -126,7 +126,7 @@ angular.module('GroupFormDefinition', [])
                 label: 'Regions',
                 excludeModal: true,
                 type: 'text',
-                ngShow: "source.value == 'rackspace' || source.value == 'ec2'",
+                ngShow: "source.value == 'rax' || source.value == 'ec2'",
                 addRequired: false,
                 editRequired: false,
                 dataTitle: 'Source Regions',
diff --git a/awx/ui/static/js/helpers/Groups.js b/awx/ui/static/js/helpers/Groups.js
index 56ba78810f..048e0bc8c7 100644
--- a/awx/ui/static/js/helpers/Groups.js
+++ b/awx/ui/static/js/helpers/Groups.js
@@ -806,7 +806,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
                        
                        LookUpInit({
                            url: GetBasePath('credentials') + 
-                               '?cloud=true&kind=' + [(scope.source.value == 'rackspace') ? 'rax' : 'aws'],   
+                               '?cloud=true&kind=' + [(scope.source.value == 'rax') ? 'rax' : 'aws'],   
                            scope: scope,
                            form: form,
                            list: CredentialList,
@@ -1000,7 +1000,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
             }
             LookUpInit({
                 url: GetBasePath('credentials') + 
-                    '?cloud=true&kind=' + [(scope.source.value == 'rackspace') ? 'rax' : 'aws'],   
+                    '?cloud=true&kind=' + [(scope.source.value == 'rax') ? 'rax' : 'aws'],   
                 scope: scope,
                 form: form,
                 list: CredentialList,
diff --git a/awx/ui/static/js/lists/HomeGroups.js b/awx/ui/static/js/lists/HomeGroups.js
index 18eb328cad..e26a10e0e7 100644
--- a/awx/ui/static/js/lists/HomeGroups.js
+++ b/awx/ui/static/js/lists/HomeGroups.js
@@ -78,7 +78,7 @@ angular.module('HomeGroupListDefinition', [])
                 searchOptions: [
                     { name: "ec2", value: "ec2" },
                     { name: "none", value: "" },
-                    { name: "rackspace", value: "rackspace" }],
+                    { name: "rax", value: "rax" }],
                 sourceModel: 'inventory_source',
                 sourceField: 'source',
                 searchOnly: true
@@ -86,7 +86,7 @@ angular.module('HomeGroupListDefinition', [])
             has_external_source: {
                 label: 'Has external source?', 
                 searchType: 'in', 
-                searchValue: 'ec2,rackspace',
+                searchValue: 'ec2,rax',
                 searchOnly: true,
                 sourceModel: 'inventory_source',
                 sourceField: 'source'
diff --git a/awx/ui/static/js/lists/InventorySummary.js b/awx/ui/static/js/lists/InventorySummary.js
index fc680356f1..8ae2f4f2a6 100644
--- a/awx/ui/static/js/lists/InventorySummary.js
+++ b/awx/ui/static/js/lists/InventorySummary.js
@@ -71,7 +71,7 @@ angular.module('InventorySummaryDefinition', [])
                 searchOptions: [
                     { name: "ec2", value: "ec2" },
                     { name: "none", value: "" },
-                    { name: "rackspace", value: "rackspace" }],
+                    { name: "rax", value: "rax" }],
                 sourceModel: 'inventory_source',
                 sourceField: 'source',
                 searchOnly: true
@@ -79,7 +79,7 @@ angular.module('InventorySummaryDefinition', [])
             has_external_source: {
                 label: 'Has external source?', 
                 searchType: 'in', 
-                searchValue: 'ec2,rackspace',
+                searchValue: 'ec2,rax',
                 searchOnly: true,
                 sourceModel: 'inventory_source',
                 sourceField: 'source'
diff --git a/awx/ui/static/js/widgets/InventorySyncStatus.js b/awx/ui/static/js/widgets/InventorySyncStatus.js
index c28ec1f983..0afc96d10b 100644
--- a/awx/ui/static/js/widgets/InventorySyncStatus.js
+++ b/awx/ui/static/js/widgets/InventorySyncStatus.js
@@ -134,7 +134,7 @@ angular.module('InventorySyncStatusWidget', ['RestServices', 'Utilities'])
                     { hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status });
                 });
         
-        url = GetBasePath('inventory_sources') + '?source__in=ec2,rackspace&page=1';
+        url = GetBasePath('inventory_sources') + '?source__in=ec2,rax&page=1';
         Rest.setUrl(url);
         Rest.get()
             .success( function(data, status, headers, config) {
@@ -146,7 +146,7 @@ angular.module('InventorySyncStatusWidget', ['RestServices', 'Utilities'])
                     { hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status });
                 });
 
-        url = GetBasePath('inventory_sources') + '?status=failed&source__in=ec2,rackspace&page=1';
+        url = GetBasePath('inventory_sources') + '?status=failed&source__in=ec2,rax&page=1';
         Rest.setUrl(url);
         Rest.get()
             .success( function(data, status, headers, config) {