diff --git a/awx/ui/client/src/inventory-scripts/add/add.route.js b/awx/ui/client/src/inventory-scripts/add/add.route.js
index d9259cf596..c9a7703fcb 100644
--- a/awx/ui/client/src/inventory-scripts/add/add.route.js
+++ b/awx/ui/client/src/inventory-scripts/add/add.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'inventoryScriptsAdd',
     route: '/inventory_scripts/add',
     templateUrl: templateUrl('inventory-scripts/add/add'),
-    controller: 'addController',
+    controller: 'inventoryScriptsAddController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/inventory-scripts/add/main.js b/awx/ui/client/src/inventory-scripts/add/main.js
index f996e43b13..3e5090566d 100644
--- a/awx/ui/client/src/inventory-scripts/add/main.js
+++ b/awx/ui/client/src/inventory-scripts/add/main.js
@@ -9,7 +9,7 @@ import controller from './add.controller';
 
 export default
     angular.module('inventoryScriptsAdd', [])
-        .controller('addController', controller)
+        .controller('inventoryScriptsAddController', controller)
         .config(['$routeProvider', function($routeProvider) {
             var url = route.route;
             delete route.route;
diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.route.js b/awx/ui/client/src/inventory-scripts/edit/edit.route.js
index 0215420bdd..2f0d9cf2e3 100644
--- a/awx/ui/client/src/inventory-scripts/edit/edit.route.js
+++ b/awx/ui/client/src/inventory-scripts/edit/edit.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'inventoryScriptsEdit',
     route: '/inventory_scripts/:inventory_script',
     templateUrl: templateUrl('inventory-scripts/edit/edit'),
-    controller: 'editController',
+    controller: 'inventoryScriptsEditController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/inventory-scripts/edit/main.js b/awx/ui/client/src/inventory-scripts/edit/main.js
index e0e3326800..17c4980986 100644
--- a/awx/ui/client/src/inventory-scripts/edit/main.js
+++ b/awx/ui/client/src/inventory-scripts/edit/main.js
@@ -9,7 +9,7 @@ import controller from './edit.controller';
 
 export default
     angular.module('inventoryScriptsEdit', [])
-        .controller('editController', controller)
+        .controller('inventoryScriptsEditController', controller)
         .config(['$routeProvider', function($routeProvider) {
             var url = route.route;
             delete route.route;
diff --git a/awx/ui/client/src/management-jobs/list/list.route.js b/awx/ui/client/src/management-jobs/list/list.route.js
index 54fbb382df..8f8dd079c5 100644
--- a/awx/ui/client/src/management-jobs/list/list.route.js
+++ b/awx/ui/client/src/management-jobs/list/list.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'managementJobsList',
     route: '/management_jobs',
     templateUrl: templateUrl('management-jobs/list/list'),
-    controller: 'listController',
+    controller: 'managementJobsListController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/management-jobs/list/main.js b/awx/ui/client/src/management-jobs/list/main.js
index 06aa5c0b3f..e0931ff394 100644
--- a/awx/ui/client/src/management-jobs/list/main.js
+++ b/awx/ui/client/src/management-jobs/list/main.js
@@ -9,7 +9,7 @@ import controller from './list.controller';
 
 export default
     angular.module('managementJobsList', [])
-        .controller('listController', controller)
+        .controller('managementJobsListController', controller)
         .config(['$routeProvider', function($routeProvider) {
              var url = route.route;
              delete route.route;
diff --git a/awx/ui/client/src/management-jobs/schedule/main.js b/awx/ui/client/src/management-jobs/schedule/main.js
index 822ecd63dd..ed46f0090b 100644
--- a/awx/ui/client/src/management-jobs/schedule/main.js
+++ b/awx/ui/client/src/management-jobs/schedule/main.js
@@ -9,7 +9,7 @@ import controller from './schedule.controller';
 
 export default
     angular.module('managementJobsSchedule', [])
-        .controller('scheduleController', controller)
+        .controller('managementJobsScheduleController', controller)
         .config(['$routeProvider', function($routeProvider) {
              var url = route.route;
              delete route.route;
diff --git a/awx/ui/client/src/management-jobs/schedule/schedule.route.js b/awx/ui/client/src/management-jobs/schedule/schedule.route.js
index 6cd1c8d1a8..526e7eddd2 100644
--- a/awx/ui/client/src/management-jobs/schedule/schedule.route.js
+++ b/awx/ui/client/src/management-jobs/schedule/schedule.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'managementJobsSchedule',
     route: '/management_jobs/:management_job/schedules',
     templateUrl: templateUrl('management-jobs/schedule/schedule'),
-    controller: 'scheduleController',
+    controller: 'managementJobsScheduleController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/permissions/add/main.js b/awx/ui/client/src/permissions/add/main.js
index ad86ab1801..d25d107646 100644
--- a/awx/ui/client/src/permissions/add/main.js
+++ b/awx/ui/client/src/permissions/add/main.js
@@ -10,7 +10,7 @@ import controller from './add.controller';
 
 export default
     angular.module('permissionsAdd', [])
-        .controller('addController', controller)
+        .controller('permissionsAddController', controller)
         .config(['$routeProvider', function($routeProvider) {
             var url = userRoute.route;
             delete userRoute.route;
diff --git a/awx/ui/client/src/permissions/add/team-add.route.js b/awx/ui/client/src/permissions/add/team-add.route.js
index 706d273f79..ecf1022a8f 100644
--- a/awx/ui/client/src/permissions/add/team-add.route.js
+++ b/awx/ui/client/src/permissions/add/team-add.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'teamPermissionsAdd',
     route: '/teams/:team_id/permissions/add',
     templateUrl: templateUrl('permissions/shared/team-permissions'),
-    controller: 'addController',
+    controller: 'permissionsAddController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/permissions/add/user-add.route.js b/awx/ui/client/src/permissions/add/user-add.route.js
index 877be6c20c..07365fb9af 100644
--- a/awx/ui/client/src/permissions/add/user-add.route.js
+++ b/awx/ui/client/src/permissions/add/user-add.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'userPermissionsAdd',
     route: '/users/:user_id/permissions/add',
     templateUrl: templateUrl('permissions/shared/user-permissions'),
-    controller: 'addController',
+    controller: 'permissionsAddController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();