diff --git a/README.rst b/README.rst
index 069cc4e9..865b88d4 100644
--- a/README.rst
+++ b/README.rst
@@ -48,9 +48,9 @@ Install Magnum UI with all dependencies in your virtual environment::
 
 And enable it in Horizon::
 
-    cp ../magnum-ui/enabled/_50_project_containers_panelgroup.py openstack_dashboard/local/enabled
-    cp ../magnum-ui/enabled/_51_project_containers_bays_panel.py openstack_dashboard/local/enabled
-    cp ../magnum-ui/enabled/_52_project_containers_baymodels_panel.py openstack_dashboard/local/enabled
+    cp ../magnum-ui/enabled/_50_project_container-infra_panelgroup.py openstack_dashboard/local/enabled
+    cp ../magnum-ui/enabled/_51_project_container-infra_bays_panel.py openstack_dashboard/local/enabled
+    cp ../magnum-ui/enabled/_52_project_container-infra_baymodels_panel.py openstack_dashboard/local/enabled
 
 To run horizon with the newly enabled Magnum UI plugin run::
 
diff --git a/enabled/_50_project_containers_panelgroup.py b/enabled/_50_project_container-infra_panelgroup.py
similarity index 86%
rename from enabled/_50_project_containers_panelgroup.py
rename to enabled/_50_project_container-infra_panelgroup.py
index 8137f6c0..b807a172 100644
--- a/enabled/_50_project_containers_panelgroup.py
+++ b/enabled/_50_project_container-infra_panelgroup.py
@@ -14,16 +14,16 @@
 from django.utils.translation import ugettext_lazy as _
 
 # The slug of the panel group to be added to HORIZON_CONFIG. Required.
-PANEL_GROUP = 'containers'
+PANEL_GROUP = 'container-infra'
 # The display name of the PANEL_GROUP. Required.
-PANEL_GROUP_NAME = _('Containers')
+PANEL_GROUP_NAME = _('Container Infrastructure')
 # The slug of the dashboard the PANEL_GROUP associated with. Required.
 PANEL_GROUP_DASHBOARD = 'project'
 
 ADD_INSTALLED_APPS = ['magnum_ui']
 
 ADD_ANGULAR_MODULES = [
-    'horizon.dashboard.containers'
+    'horizon.dashboard.container-infra'
 ]
 
 ADD_JS_FILES = [
@@ -31,7 +31,7 @@ ADD_JS_FILES = [
 ]
 
 ADD_SCSS_FILES = [
-    'dashboard/containers/containers.scss'
+    'dashboard/container-infra/container-infra.scss'
 ]
 
 AUTO_DISCOVER_STATIC_FILES = True
diff --git a/enabled/_51_project_containers_bays_panel.py b/enabled/_51_project_container-infra_bays_panel.py
similarity index 96%
rename from enabled/_51_project_containers_bays_panel.py
rename to enabled/_51_project_container-infra_bays_panel.py
index 00192534..80eb03d2 100644
--- a/enabled/_51_project_containers_bays_panel.py
+++ b/enabled/_51_project_container-infra_bays_panel.py
@@ -15,7 +15,7 @@
 # The slug of the panel to be added to HORIZON_CONFIG. Required.
 PANEL = 'bays'
 # The slug of the panel group the PANEL is associated with.
-PANEL_GROUP = 'containers'
+PANEL_GROUP = 'container-infra'
 # The slug of the dashboard the PANEL associated with. Required.
 PANEL_DASHBOARD = 'project'
 
diff --git a/enabled/_52_project_containers_baymodels_panel.py b/enabled/_52_project_container-infra_baymodels_panel.py
similarity index 96%
rename from enabled/_52_project_containers_baymodels_panel.py
rename to enabled/_52_project_container-infra_baymodels_panel.py
index 77166ef6..c40e2be5 100644
--- a/enabled/_52_project_containers_baymodels_panel.py
+++ b/enabled/_52_project_container-infra_baymodels_panel.py
@@ -15,7 +15,7 @@
 # The slug of the panel to be added to HORIZON_CONFIG. Required.
 PANEL = 'baymodels'
 # The slug of the panel group the PANEL is associated with.
-PANEL_GROUP = 'containers'
+PANEL_GROUP = 'container-infra'
 # The slug of the dashboard the PANEL associated with. Required.
 PANEL_DASHBOARD = 'project'
 
diff --git a/magnum_ui/api/magnum.py b/magnum_ui/api/magnum.py
index 56c2569c..e5377928 100644
--- a/magnum_ui/api/magnum.py
+++ b/magnum_ui/api/magnum.py
@@ -39,9 +39,10 @@ BAY_CREATE_ATTRS = ['name', 'baymodel_id', 'node_count', 'discovery_url',
 def magnumclient(request):
     magnum_url = ""
     try:
-        magnum_url = base.url_for(request, 'container')
+        magnum_url = base.url_for(request, 'container-infra')
     except exceptions.ServiceCatalogException:
-        LOG.debug('No Containers service is configured.')
+        LOG.debug('No Container Infrastructure Management service is '
+                  'configured.')
         return None
 
     LOG.debug('magnumclient connection created using the token "%s" and url'
diff --git a/magnum_ui/api/rest/magnum.py b/magnum_ui/api/rest/magnum.py
index d15f218d..7d9a0994 100644
--- a/magnum_ui/api/rest/magnum.py
+++ b/magnum_ui/api/rest/magnum.py
@@ -33,7 +33,7 @@ def change_to_id(obj):
 @urls.register
 class Baymodel(generic.View):
     """API for retrieving a single baymodel"""
-    url_regex = r'containers/baymodels/(?P<baymodel_id>[^/]+)$'
+    url_regex = r'container-infra/baymodels/(?P<baymodel_id>[^/]+)$'
 
     @rest_utils.ajax()
     def get(self, request, baymodel_id):
@@ -44,7 +44,7 @@ class Baymodel(generic.View):
 @urls.register
 class Baymodels(generic.View):
     """API for Magnum Baymodels"""
-    url_regex = r'containers/baymodels/$'
+    url_regex = r'container-infra/baymodels/$'
 
     @rest_utils.ajax()
     def get(self, request):
@@ -73,14 +73,14 @@ class Baymodels(generic.View):
         """
         new_baymodel = magnum.baymodel_create(request, **request.DATA)
         return rest_utils.CreatedResponse(
-            '/api/containers/baymodel/%s' % new_baymodel.uuid,
+            '/api/container-infra/baymodel/%s' % new_baymodel.uuid,
             new_baymodel.to_dict())
 
 
 @urls.register
 class Bay(generic.View):
     """API for retrieving a single bay"""
-    url_regex = r'containers/bays/(?P<bay_id>[^/]+)$'
+    url_regex = r'container-infra/bays/(?P<bay_id>[^/]+)$'
 
     @rest_utils.ajax()
     def get(self, request, bay_id):
@@ -91,7 +91,7 @@ class Bay(generic.View):
 @urls.register
 class Bays(generic.View):
     """API for Magnum Bays"""
-    url_regex = r'containers/bays/$'
+    url_regex = r'container-infra/bays/$'
 
     @rest_utils.ajax()
     def get(self, request):
@@ -120,5 +120,5 @@ class Bays(generic.View):
         """
         new_bay = magnum.bay_create(request, **request.DATA)
         return rest_utils.CreatedResponse(
-            '/api/containers/bay/%s' % new_bay.uuid,
+            '/api/container-infra/bay/%s' % new_bay.uuid,
             new_bay.to_dict())
diff --git a/magnum_ui/static/dashboard/containers/baymodels/actions.module.js b/magnum_ui/static/dashboard/container-infra/baymodels/actions.module.js
similarity index 81%
rename from magnum_ui/static/dashboard/containers/baymodels/actions.module.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/actions.module.js
index c5156a85..b27e1823 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/actions.module.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/actions.module.js
@@ -17,21 +17,21 @@
 
   /**
    * @ngdoc overview
-   * @ngname horizon.dashboard.containers.baymodels.actions
+   * @ngname horizon.dashboard.container-infra.baymodels.actions
    *
    * @description
    * Provides all of the actions for baymodels.
    */
-  angular.module('horizon.dashboard.containers.baymodels.actions', ['horizon.framework', 'horizon.dashboard.containers'])
+  angular.module('horizon.dashboard.container-infra.baymodels.actions', ['horizon.framework', 'horizon.dashboard.container-infra'])
    .run(registerBaymodelActions);
 
   registerBaymodelActions.$inject = [
     'horizon.framework.conf.resource-type-registry.service',
     'horizon.framework.util.i18n.gettext',
-    'horizon.dashboard.containers.baymodels.create.service',
-    'horizon.dashboard.containers.baymodels.delete.service',
-    'horizon.dashboard.containers.bays.create.service',
-    'horizon.dashboard.containers.baymodels.resourceType',
+    'horizon.dashboard.container-infra.baymodels.create.service',
+    'horizon.dashboard.container-infra.baymodels.delete.service',
+    'horizon.dashboard.container-infra.bays.create.service',
+    'horizon.dashboard.container-infra.baymodels.resourceType',
   ];
 
   function registerBaymodelActions(
diff --git a/magnum_ui/static/dashboard/containers/baymodels/baymodels.module.js b/magnum_ui/static/dashboard/container-infra/baymodels/baymodels.module.js
similarity index 61%
rename from magnum_ui/static/dashboard/containers/baymodels/baymodels.module.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/baymodels.module.js
index 5b639a53..d0ede1c5 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/baymodels.module.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/baymodels.module.js
@@ -19,7 +19,7 @@
 
   /**
    * @ngdoc overview
-   * @name horizon.dashboard.containers.baymodels
+   * @name horizon.dashboard.container-infra.baymodels
    * @ngModule
    *
    * @description
@@ -27,19 +27,19 @@
    * panel
    */
   angular
-    .module('horizon.dashboard.containers.baymodels', ['horizon.dashboard.containers.baymodels.actions'])
-    .constant('horizon.dashboard.containers.baymodels.events', events())
-    .constant('horizon.dashboard.containers.baymodels.resourceType', 'OS::Magnum::Baymodel');
+    .module('horizon.dashboard.container-infra.baymodels', ['horizon.dashboard.container-infra.baymodels.actions'])
+    .constant('horizon.dashboard.container-infra.baymodels.events', events())
+    .constant('horizon.dashboard.container-infra.baymodels.resourceType', 'OS::Magnum::Baymodel');
 
   /**
    * @ngdoc constant
-   * @name horizon.dashboard.containers.baymodels.events
+   * @name horizon.dashboard.container-infra.baymodels.events
    * @description A list of events used by Baymodels
    */
   function events() {
     return {
-      CREATE_SUCCESS: 'horizon.dashboard.containers.baymodels.CREATE_SUCCESS',
-      DELETE_SUCCESS: 'horizon.dashboard.containers.baymodels.DELETE_SUCCESS'
+      CREATE_SUCCESS: 'horizon.dashboard.container-infra.baymodels.CREATE_SUCCESS',
+      DELETE_SUCCESS: 'horizon.dashboard.container-infra.baymodels.DELETE_SUCCESS'
     };
   }
 })();
diff --git a/magnum_ui/static/dashboard/containers/baymodels/baymodels.module.spec.js b/magnum_ui/static/dashboard/container-infra/baymodels/baymodels.module.spec.js
similarity index 81%
rename from magnum_ui/static/dashboard/containers/baymodels/baymodels.module.spec.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/baymodels.module.spec.js
index bc40a8e0..63239e1f 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/baymodels.module.spec.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/baymodels.module.spec.js
@@ -16,9 +16,9 @@
 (function() {
   'use strict';
 
-  describe('horizon.dashboard.containers.baymodels', function() {
+  describe('horizon.dashboard.container-infra.baymodels', function() {
     it('should exist', function() {
-      expect(angular.module('horizon.dashboard.containers.baymodels')).toBeDefined();
+      expect(angular.module('horizon.dashboard.container-infra.baymodels')).toBeDefined();
     });
   });
 
diff --git a/magnum_ui/static/dashboard/containers/baymodels/baymodels.scss b/magnum_ui/static/dashboard/container-infra/baymodels/baymodels.scss
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/baymodels.scss
rename to magnum_ui/static/dashboard/container-infra/baymodels/baymodels.scss
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/baymodel-model.js b/magnum_ui/static/dashboard/container-infra/baymodels/create/baymodel-model.js
similarity index 97%
rename from magnum_ui/static/dashboard/containers/baymodels/create/baymodel-model.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/baymodel-model.js
index be11cf46..b5bf5637 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/create/baymodel-model.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/create/baymodel-model.js
@@ -18,7 +18,7 @@
   'use strict';
 
   angular
-    .module('horizon.dashboard.containers.baymodels')
+    .module('horizon.dashboard.container-infra.baymodels')
     .factory('baymodelModel', baymodelModel);
 
   baymodelModel.$inject = [
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/create-workflow.service.js b/magnum_ui/static/dashboard/container-infra/baymodels/create/create-workflow.service.js
similarity index 91%
rename from magnum_ui/static/dashboard/containers/baymodels/create/create-workflow.service.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/create-workflow.service.js
index ce7891c3..8fe84326 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/create/create-workflow.service.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/create/create-workflow.service.js
@@ -18,11 +18,11 @@
   'use strict';
 
   angular
-    .module('horizon.dashboard.containers.baymodels')
-    .factory('horizon.dashboard.containers.baymodels.workflow', baymodelWorkflow);
+    .module('horizon.dashboard.container-infra.baymodels')
+    .factory('horizon.dashboard.container-infra.baymodels.workflow', baymodelWorkflow);
 
   baymodelWorkflow.$inject = [
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.workflow.factory',
     'horizon.framework.util.i18n.gettext'
   ];
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/create.service.js b/magnum_ui/static/dashboard/container-infra/baymodels/create/create.service.js
similarity index 83%
rename from magnum_ui/static/dashboard/containers/baymodels/create/create.service.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/create.service.js
index 8b41033c..968d8518 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/create/create.service.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/create/create.service.js
@@ -19,19 +19,19 @@
 
   /**
    * @ngdoc overview
-   * @name horizon.dashboard.containers.baymodels.create.service
-   * @description Service for the containers bay model create modal
+   * @name horizon.dashboard.container-infra.baymodels.create.service
+   * @description Service for the container-infra bay model create modal
    */
   angular
-    .module('horizon.dashboard.containers.baymodels')
-    .factory('horizon.dashboard.containers.baymodels.create.service', createService);
+    .module('horizon.dashboard.container-infra.baymodels')
+    .factory('horizon.dashboard.container-infra.baymodels.create.service', createService);
 
   createService.$inject = [
     'baymodelModel',
     'horizon.framework.widgets.modal.wizard-modal.service',
     'horizon.framework.widgets.toast.service',
-    'horizon.dashboard.containers.baymodels.workflow',
-    'horizon.dashboard.containers.baymodels.events',
+    'horizon.dashboard.container-infra.baymodels.workflow',
+    'horizon.dashboard.container-infra.baymodels.events',
     'horizon.app.core.openstack-service-api.policy',
     'horizon.framework.util.i18n.gettext',
     'horizon.framework.util.q.extensions'
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/info/baymodel.info.controller.js b/magnum_ui/static/dashboard/container-infra/baymodels/create/info/baymodel.info.controller.js
similarity index 97%
rename from magnum_ui/static/dashboard/containers/baymodels/create/info/baymodel.info.controller.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/info/baymodel.info.controller.js
index 7d963e09..5b6e44e3 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/create/info/baymodel.info.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/create/info/baymodel.info.controller.js
@@ -26,13 +26,13 @@
    * Controller for the bay model info step in create workflow
    */
   angular
-    .module('horizon.dashboard.containers.baymodels')
+    .module('horizon.dashboard.container-infra.baymodels')
     .controller('createBaymodelInfoController', createBaymodelInfoController);
 
   createBaymodelInfoController.$inject = [
     '$q',
     '$scope',
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.openstack-service-api.magnum',
     'horizon.framework.util.i18n.gettext'
   ];
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/info/info.help.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/info/info.help.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/info/info.help.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/info/info.help.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/info/info.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/info/info.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/info/info.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/info/info.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/labels/baymodel.labels.controller.js b/magnum_ui/static/dashboard/container-infra/baymodels/create/labels/baymodel.labels.controller.js
similarity index 91%
rename from magnum_ui/static/dashboard/containers/baymodels/create/labels/baymodel.labels.controller.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/labels/baymodel.labels.controller.js
index c3e3e7ed..29325aa9 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/create/labels/baymodel.labels.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/create/labels/baymodel.labels.controller.js
@@ -26,13 +26,13 @@
    * Controller for the bay model labels step in create workflow
    */
   angular
-    .module('horizon.dashboard.containers.baymodels')
+    .module('horizon.dashboard.container-infra.baymodels')
     .controller('createBaymodelLabelsController', createBaymodelLabelsController);
 
   createBaymodelLabelsController.$inject = [
     '$q',
     '$scope',
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.openstack-service-api.magnum'
   ];
 
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/labels/labels.help.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/labels/labels.help.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/labels/labels.help.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/labels/labels.help.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/labels/labels.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/labels/labels.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/labels/labels.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/labels/labels.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/network/baymodel.network.controller.js b/magnum_ui/static/dashboard/container-infra/baymodels/create/network/baymodel.network.controller.js
similarity index 91%
rename from magnum_ui/static/dashboard/containers/baymodels/create/network/baymodel.network.controller.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/network/baymodel.network.controller.js
index 775969ce..eef31806 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/create/network/baymodel.network.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/create/network/baymodel.network.controller.js
@@ -26,13 +26,13 @@
    * Controller for the bay model network step in create workflow
    */
   angular
-    .module('horizon.dashboard.containers.baymodels')
+    .module('horizon.dashboard.container-infra.baymodels')
     .controller('createBaymodelNetworkController', createBaymodelNetworkController);
 
   createBaymodelNetworkController.$inject = [
     '$q',
     '$scope',
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.openstack-service-api.magnum'
   ];
 
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/network/network.help.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/network/network.help.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/network/network.help.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/network/network.help.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/network/network.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/network/network.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/network/network.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/network/network.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/spec/baymodel.spec.controller.js b/magnum_ui/static/dashboard/container-infra/baymodels/create/spec/baymodel.spec.controller.js
similarity index 95%
rename from magnum_ui/static/dashboard/containers/baymodels/create/spec/baymodel.spec.controller.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/spec/baymodel.spec.controller.js
index 4205bf21..e824b133 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/create/spec/baymodel.spec.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/create/spec/baymodel.spec.controller.js
@@ -26,13 +26,13 @@
    * Controller for the bay model spec step in create workflow
    */
   angular
-    .module('horizon.dashboard.containers.baymodels')
+    .module('horizon.dashboard.container-infra.baymodels')
     .controller('createBaymodelSpecController', createBaymodelSpecController);
 
   createBaymodelSpecController.$inject = [
     '$q',
     '$scope',
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.openstack-service-api.magnum',
     'horizon.app.core.openstack-service-api.nova',
     'horizon.app.core.openstack-service-api.glance'
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/spec/spec.help.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/spec/spec.help.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/spec/spec.help.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/spec/spec.help.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/create/spec/spec.html b/magnum_ui/static/dashboard/container-infra/baymodels/create/spec/spec.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/create/spec/spec.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/create/spec/spec.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/delete/delete.service.js b/magnum_ui/static/dashboard/container-infra/baymodels/delete/delete.service.js
similarity index 92%
rename from magnum_ui/static/dashboard/containers/baymodels/delete/delete.service.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/delete/delete.service.js
index 7a37dc13..c7c002b0 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/delete/delete.service.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/delete/delete.service.js
@@ -16,8 +16,8 @@
   'use strict';
 
   angular
-    .module('horizon.dashboard.containers.baymodels')
-    .factory('horizon.dashboard.containers.baymodels.delete.service', deleteService);
+    .module('horizon.dashboard.container-infra.baymodels')
+    .factory('horizon.dashboard.container-infra.baymodels.delete.service', deleteService);
 
   deleteService.$inject = [
     'horizon.app.core.openstack-service-api.magnum',
@@ -25,12 +25,12 @@
     'horizon.framework.widgets.modal.deleteModalService',
     'horizon.framework.util.i18n.gettext',
     'horizon.framework.util.q.extensions',
-    'horizon.dashboard.containers.baymodels.events'
+    'horizon.dashboard.container-infra.baymodels.events'
   ];
 
   /**
    * @ngDoc factory
-   * @name horizon.dashboard.containers.baymodels.delete.service
+   * @name horizon.dashboard.container-infra.baymodels.delete.service
    *
    * @Description
    * Brings up the delete baymodels confirmation modal dialog.
diff --git a/magnum_ui/static/dashboard/containers/baymodels/detail/detail.controller.js b/magnum_ui/static/dashboard/container-infra/baymodels/detail/detail.controller.js
similarity index 91%
rename from magnum_ui/static/dashboard/containers/baymodels/detail/detail.controller.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/detail/detail.controller.js
index 121f15c4..46e22c20 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/detail/detail.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/detail/detail.controller.js
@@ -17,7 +17,7 @@
   "use strict";
 
   angular
-    .module('horizon.dashboard.containers.baymodels')
+    .module('horizon.dashboard.container-infra.baymodels')
     .controller('BaymodelDetailController', BaymodelDetailController);
 
   BaymodelDetailController.$inject = [
@@ -27,10 +27,10 @@
     '$routeParams',
     'horizon.app.core.openstack-service-api.magnum',
     'horizon.app.core.openstack-service-api.glance',
-    'horizon.dashboard.containers.baymodels.events',
-    'horizon.dashboard.containers.bays.events',
+    'horizon.dashboard.container-infra.baymodels.events',
+    'horizon.dashboard.container-infra.bays.events',
     'horizon.framework.conf.resource-type-registry.service',
-    'horizon.dashboard.containers.baymodels.resourceType'
+    'horizon.dashboard.container-infra.baymodels.resourceType'
   ];
 
   function BaymodelDetailController($scope, $window, $location, $routeParams, magnum, glance, events, bayEvents, registry, baymodelResourceType) {
diff --git a/magnum_ui/static/dashboard/containers/baymodels/detail/detail.html b/magnum_ui/static/dashboard/container-infra/baymodels/detail/detail.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/baymodels/detail/detail.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/detail/detail.html
diff --git a/magnum_ui/static/dashboard/containers/baymodels/table/table.controller.js b/magnum_ui/static/dashboard/container-infra/baymodels/table/table.controller.js
similarity index 83%
rename from magnum_ui/static/dashboard/containers/baymodels/table/table.controller.js
rename to magnum_ui/static/dashboard/container-infra/baymodels/table/table.controller.js
index b04534f5..3375196e 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/table/table.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/table/table.controller.js
@@ -19,27 +19,27 @@
 
   /**
    * @ngdoc overview
-   * @name containersBaymodelsTableController
+   * @name BaymodelsTableController
    * @ngController
    *
    * @description
-   * Controller for the containers bay model table
+   * Controller for the container-infra bay model table
    */
   angular
-    .module('horizon.dashboard.containers.baymodels')
-    .controller('containersBaymodelsTableController', containersBaymodelsTableController);
+    .module('horizon.dashboard.container-infra.baymodels')
+    .controller('BaymodelsTableController', BaymodelsTableController);
 
-  containersBaymodelsTableController.$inject = [
+  BaymodelsTableController.$inject = [
     '$scope',
     '$location',
     'horizon.app.core.openstack-service-api.magnum',
-    'horizon.dashboard.containers.baymodels.events',
-    'horizon.dashboard.containers.bays.events',
+    'horizon.dashboard.container-infra.baymodels.events',
+    'horizon.dashboard.container-infra.bays.events',
     'horizon.framework.conf.resource-type-registry.service',
-    'horizon.dashboard.containers.baymodels.resourceType'
+    'horizon.dashboard.container-infra.baymodels.resourceType'
   ];
 
-  function containersBaymodelsTableController($scope, $location, magnum, events, bayEvents, registry, baymodelResourceType) {
+  function BaymodelsTableController($scope, $location, magnum, events, bayEvents, registry, baymodelResourceType) {
     var ctrl = this;
     ctrl.baymodels = [];
     ctrl.baymodelsSrc = [];
diff --git a/magnum_ui/static/dashboard/containers/baymodels/table/table.html b/magnum_ui/static/dashboard/container-infra/baymodels/table/table.html
similarity index 98%
rename from magnum_ui/static/dashboard/containers/baymodels/table/table.html
rename to magnum_ui/static/dashboard/container-infra/baymodels/table/table.html
index 8f6e3ba3..7947bc9c 100644
--- a/magnum_ui/static/dashboard/containers/baymodels/table/table.html
+++ b/magnum_ui/static/dashboard/container-infra/baymodels/table/table.html
@@ -1,5 +1,5 @@
 <div>
-  <hz-magic-search-context ng-controller="containersBaymodelsTableController as table"
+  <hz-magic-search-context ng-controller="BaymodelsTableController as table"
     filter-facets="table.baymodelFacets">
     <hz-magic-search-bar></hz-magic-search-bar>
     <actions class="batch-action" allowed="table.baymodelResource.batchActions" type="batch"></actions>
diff --git a/magnum_ui/static/dashboard/containers/bays/actions.module.js b/magnum_ui/static/dashboard/container-infra/bays/actions.module.js
similarity index 82%
rename from magnum_ui/static/dashboard/containers/bays/actions.module.js
rename to magnum_ui/static/dashboard/container-infra/bays/actions.module.js
index 5ff43367..d8a46cec 100644
--- a/magnum_ui/static/dashboard/containers/bays/actions.module.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/actions.module.js
@@ -17,20 +17,20 @@
 
   /**
    * @ngdoc overview
-   * @ngname horizon.dashboard.containers.bays.actions
+   * @ngname horizon.dashboard.container-infra.bays.actions
    *
    * @description
    * Provides all of the actions for bays.
    */
-  angular.module('horizon.dashboard.containers.bays.actions', ['horizon.framework', 'horizon.dashboard.containers'])
+  angular.module('horizon.dashboard.container-infra.bays.actions', ['horizon.framework', 'horizon.dashboard.container-infra'])
    .run(registerBayActions);
 
   registerBayActions.$inject = [
     'horizon.framework.conf.resource-type-registry.service',
     'horizon.framework.util.i18n.gettext',
-    'horizon.dashboard.containers.bays.create.service',
-    'horizon.dashboard.containers.bays.delete.service',
-    'horizon.dashboard.containers.bays.resourceType',
+    'horizon.dashboard.container-infra.bays.create.service',
+    'horizon.dashboard.container-infra.bays.delete.service',
+    'horizon.dashboard.container-infra.bays.resourceType',
   ];
 
   function registerBayActions(
diff --git a/magnum_ui/static/dashboard/containers/bays/bays.module.js b/magnum_ui/static/dashboard/container-infra/bays/bays.module.js
similarity index 67%
rename from magnum_ui/static/dashboard/containers/bays/bays.module.js
rename to magnum_ui/static/dashboard/container-infra/bays/bays.module.js
index bf8ca856..cc9ce95a 100644
--- a/magnum_ui/static/dashboard/containers/bays/bays.module.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/bays.module.js
@@ -19,7 +19,7 @@
 
   /**
    * @ngdoc overview
-   * @name horizon.dashboard.containers.bays
+   * @name horizon.dashboard.container-infra.bays
    * @ngModule
    *
    * @description
@@ -27,9 +27,9 @@
    * panel
    */
   angular
-    .module('horizon.dashboard.containers.bays', ['horizon.dashboard.containers.bays.actions'])
-    .constant('horizon.dashboard.containers.bays.events', events())
-    .constant('horizon.dashboard.containers.bays.resourceType', 'OS::Magnum::Bay');
+    .module('horizon.dashboard.container-infra.bays', ['horizon.dashboard.container-infra.bays.actions'])
+    .constant('horizon.dashboard.container-infra.bays.events', events())
+    .constant('horizon.dashboard.container-infra.bays.resourceType', 'OS::Magnum::Bay');
 
   /**
    * @ngdoc constant
@@ -38,8 +38,8 @@
    */
   function events() {
     return {
-      CREATE_SUCCESS: 'horizon.dashboard.containers.bays.CREATE_SUCCESS',
-      DELETE_SUCCESS: 'horizon.dashboard.containers.bays.DELETE_SUCCESS'
+      CREATE_SUCCESS: 'horizon.dashboard.container-infra.bays.CREATE_SUCCESS',
+      DELETE_SUCCESS: 'horizon.dashboard.container-infra.bays.DELETE_SUCCESS'
     };
   }
 })();
diff --git a/magnum_ui/static/dashboard/containers/bays/bays.module.spec.js b/magnum_ui/static/dashboard/container-infra/bays/bays.module.spec.js
similarity index 81%
rename from magnum_ui/static/dashboard/containers/bays/bays.module.spec.js
rename to magnum_ui/static/dashboard/container-infra/bays/bays.module.spec.js
index 0036d042..10cd0e72 100644
--- a/magnum_ui/static/dashboard/containers/bays/bays.module.spec.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/bays.module.spec.js
@@ -16,9 +16,9 @@
 (function() {
   'use strict';
 
-  describe('horizon.dashboard.containers.bays', function() {
+  describe('horizon.dashboard.container-infra.bays', function() {
     it('should exist', function() {
-      expect(angular.module('horizon.dashboard.containers.bays')).toBeDefined();
+      expect(angular.module('horizon.dashboard.container-infra.bays')).toBeDefined();
     });
   });
 
diff --git a/magnum_ui/static/dashboard/containers/bays/bays.scss b/magnum_ui/static/dashboard/container-infra/bays/bays.scss
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/bays.scss
rename to magnum_ui/static/dashboard/container-infra/bays/bays.scss
diff --git a/magnum_ui/static/dashboard/containers/bays/create/bay-model.js b/magnum_ui/static/dashboard/container-infra/bays/create/bay-model.js
similarity index 92%
rename from magnum_ui/static/dashboard/containers/bays/create/bay-model.js
rename to magnum_ui/static/dashboard/container-infra/bays/create/bay-model.js
index 26afaf5a..963ad5fd 100644
--- a/magnum_ui/static/dashboard/containers/bays/create/bay-model.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/create/bay-model.js
@@ -18,8 +18,8 @@
   'use strict';
 
   angular
-    .module('horizon.dashboard.containers.bays')
-    .factory('horizon.dashboard.containers.bays.bayModel', bayModel);
+    .module('horizon.dashboard.container-infra.bays')
+    .factory('horizon.dashboard.container-infra.bays.bayModel', bayModel);
 
   bayModel.$inject = [
     'horizon.app.core.openstack-service-api.magnum'
diff --git a/magnum_ui/static/dashboard/containers/bays/create/create-workflow.service.js b/magnum_ui/static/dashboard/container-infra/bays/create/create-workflow.service.js
similarity index 90%
rename from magnum_ui/static/dashboard/containers/bays/create/create-workflow.service.js
rename to magnum_ui/static/dashboard/container-infra/bays/create/create-workflow.service.js
index e976b14a..ec67e6a8 100644
--- a/magnum_ui/static/dashboard/containers/bays/create/create-workflow.service.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/create/create-workflow.service.js
@@ -18,11 +18,11 @@
   'use strict';
 
   angular
-    .module('horizon.dashboard.containers.bays')
-    .factory('horizon.dashboard.containers.bays.workflow', bayWorkflow);
+    .module('horizon.dashboard.container-infra.bays')
+    .factory('horizon.dashboard.container-infra.bays.workflow', bayWorkflow);
 
   bayWorkflow.$inject = [
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.workflow.factory',
     'horizon.framework.util.i18n.gettext'
   ];
diff --git a/magnum_ui/static/dashboard/containers/bays/create/create.service.js b/magnum_ui/static/dashboard/container-infra/bays/create/create.service.js
similarity index 82%
rename from magnum_ui/static/dashboard/containers/bays/create/create.service.js
rename to magnum_ui/static/dashboard/container-infra/bays/create/create.service.js
index d439718e..c07fd950 100644
--- a/magnum_ui/static/dashboard/containers/bays/create/create.service.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/create/create.service.js
@@ -17,19 +17,19 @@
 
   /**
    * @ngdoc overview
-   * @name horizon.dashboard.containers.bays.create.service
-   * @description Service for the containers bay create modal
+   * @name horizon.dashboard.container-infra.bays.create.service
+   * @description Service for the container-infra bay create modal
    */
   angular
-    .module('horizon.dashboard.containers.bays')
-    .factory('horizon.dashboard.containers.bays.create.service', createService);
+    .module('horizon.dashboard.container-infra.bays')
+    .factory('horizon.dashboard.container-infra.bays.create.service', createService);
 
   createService.$inject = [
-    'horizon.dashboard.containers.bays.bayModel',
+    'horizon.dashboard.container-infra.bays.bayModel',
     'horizon.framework.widgets.modal.wizard-modal.service',
     'horizon.framework.widgets.toast.service',
-    'horizon.dashboard.containers.bays.workflow',
-    'horizon.dashboard.containers.bays.events',
+    'horizon.dashboard.container-infra.bays.workflow',
+    'horizon.dashboard.container-infra.bays.events',
     'horizon.app.core.openstack-service-api.policy',
     'horizon.framework.util.i18n.gettext',
     'horizon.framework.util.q.extensions'
diff --git a/magnum_ui/static/dashboard/containers/bays/create/info/bay.info.controller.js b/magnum_ui/static/dashboard/container-infra/bays/create/info/bay.info.controller.js
similarity index 93%
rename from magnum_ui/static/dashboard/containers/bays/create/info/bay.info.controller.js
rename to magnum_ui/static/dashboard/container-infra/bays/create/info/bay.info.controller.js
index a8e5b97e..e4ac1f9c 100644
--- a/magnum_ui/static/dashboard/containers/bays/create/info/bay.info.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/create/info/bay.info.controller.js
@@ -23,16 +23,16 @@
    * @ngController
    *
    * @description
-   * Controller for the containers bay info step in create workflow
+   * Controller for the container-infra bay info step in create workflow
    */
   angular
-    .module('horizon.dashboard.containers.bays')
+    .module('horizon.dashboard.container-infra.bays')
     .controller('createBayInfoController', createBayInfoController);
 
   createBayInfoController.$inject = [
     '$q',
     '$scope',
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.openstack-service-api.magnum'
   ];
 
diff --git a/magnum_ui/static/dashboard/containers/bays/create/info/info.help.html b/magnum_ui/static/dashboard/container-infra/bays/create/info/info.help.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/create/info/info.help.html
rename to magnum_ui/static/dashboard/container-infra/bays/create/info/info.help.html
diff --git a/magnum_ui/static/dashboard/containers/bays/create/info/info.html b/magnum_ui/static/dashboard/container-infra/bays/create/info/info.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/create/info/info.html
rename to magnum_ui/static/dashboard/container-infra/bays/create/info/info.html
diff --git a/magnum_ui/static/dashboard/containers/bays/create/misc/bay.misc.controller.js b/magnum_ui/static/dashboard/container-infra/bays/create/misc/bay.misc.controller.js
similarity index 85%
rename from magnum_ui/static/dashboard/containers/bays/create/misc/bay.misc.controller.js
rename to magnum_ui/static/dashboard/container-infra/bays/create/misc/bay.misc.controller.js
index feff39d4..ef86e3f4 100644
--- a/magnum_ui/static/dashboard/containers/bays/create/misc/bay.misc.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/create/misc/bay.misc.controller.js
@@ -23,15 +23,15 @@
    * @ngController
    *
    * @description
-   * Controller for the containers bay misc step in create workflow
+   * Controller for the container-infra bay misc step in create workflow
    */
   angular
-    .module('horizon.dashboard.containers.bays')
+    .module('horizon.dashboard.container-infra.bays')
     .controller('createBayMiscController', createBayMiscController);
 
   createBayMiscController.$inject = [
     '$scope',
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.openstack-service-api.magnum'
   ];
 
diff --git a/magnum_ui/static/dashboard/containers/bays/create/misc/misc.help.html b/magnum_ui/static/dashboard/container-infra/bays/create/misc/misc.help.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/create/misc/misc.help.html
rename to magnum_ui/static/dashboard/container-infra/bays/create/misc/misc.help.html
diff --git a/magnum_ui/static/dashboard/containers/bays/create/misc/misc.html b/magnum_ui/static/dashboard/container-infra/bays/create/misc/misc.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/create/misc/misc.html
rename to magnum_ui/static/dashboard/container-infra/bays/create/misc/misc.html
diff --git a/magnum_ui/static/dashboard/containers/bays/create/size/bay.size.controller.js b/magnum_ui/static/dashboard/container-infra/bays/create/size/bay.size.controller.js
similarity index 85%
rename from magnum_ui/static/dashboard/containers/bays/create/size/bay.size.controller.js
rename to magnum_ui/static/dashboard/container-infra/bays/create/size/bay.size.controller.js
index f49f443a..841e850b 100644
--- a/magnum_ui/static/dashboard/containers/bays/create/size/bay.size.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/create/size/bay.size.controller.js
@@ -23,15 +23,15 @@
    * @ngController
    *
    * @description
-   * Controller for the containers bay size step in create workflow
+   * Controller for the container-infra bay size step in create workflow
    */
   angular
-    .module('horizon.dashboard.containers.bays')
+    .module('horizon.dashboard.container-infra.bays')
     .controller('createBaySizeController', createBaySizeController);
 
   createBaySizeController.$inject = [
     '$scope',
-    'horizon.dashboard.containers.basePath',
+    'horizon.dashboard.container-infra.basePath',
     'horizon.app.core.openstack-service-api.magnum'
   ];
 
diff --git a/magnum_ui/static/dashboard/containers/bays/create/size/size.help.html b/magnum_ui/static/dashboard/container-infra/bays/create/size/size.help.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/create/size/size.help.html
rename to magnum_ui/static/dashboard/container-infra/bays/create/size/size.help.html
diff --git a/magnum_ui/static/dashboard/containers/bays/create/size/size.html b/magnum_ui/static/dashboard/container-infra/bays/create/size/size.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/create/size/size.html
rename to magnum_ui/static/dashboard/container-infra/bays/create/size/size.html
diff --git a/magnum_ui/static/dashboard/containers/bays/delete/delete.service.js b/magnum_ui/static/dashboard/container-infra/bays/delete/delete.service.js
similarity index 93%
rename from magnum_ui/static/dashboard/containers/bays/delete/delete.service.js
rename to magnum_ui/static/dashboard/container-infra/bays/delete/delete.service.js
index bbfa8e7b..100ef239 100644
--- a/magnum_ui/static/dashboard/containers/bays/delete/delete.service.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/delete/delete.service.js
@@ -16,8 +16,8 @@
   'use strict';
 
   angular
-    .module('horizon.dashboard.containers.bays')
-    .factory('horizon.dashboard.containers.bays.delete.service', deleteService);
+    .module('horizon.dashboard.container-infra.bays')
+    .factory('horizon.dashboard.container-infra.bays.delete.service', deleteService);
 
   deleteService.$inject = [
     'horizon.app.core.openstack-service-api.magnum',
@@ -25,12 +25,12 @@
     'horizon.framework.widgets.modal.deleteModalService',
     'horizon.framework.util.i18n.gettext',
     'horizon.framework.util.q.extensions',
-    'horizon.dashboard.containers.bays.events'
+    'horizon.dashboard.container-infra.bays.events'
   ];
 
   /**
    * @ngDoc factory
-   * @name horizon.dashboard.containers.bays.delete.service
+   * @name horizon.dashboard.container-infra.bays.delete.service
    *
    * @Description
    * Brings up the delete bays confirmation modal dialog.
diff --git a/magnum_ui/static/dashboard/containers/bays/detail/detail.controller.js b/magnum_ui/static/dashboard/container-infra/bays/detail/detail.controller.js
similarity index 91%
rename from magnum_ui/static/dashboard/containers/bays/detail/detail.controller.js
rename to magnum_ui/static/dashboard/container-infra/bays/detail/detail.controller.js
index fb3aade1..26ceff0e 100644
--- a/magnum_ui/static/dashboard/containers/bays/detail/detail.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/detail/detail.controller.js
@@ -17,7 +17,7 @@
   "use strict";
 
   angular
-    .module('horizon.dashboard.containers.bays')
+    .module('horizon.dashboard.container-infra.bays')
     .controller('BayDetailController', BayDetailController);
 
   BayDetailController.$inject = [
@@ -26,9 +26,9 @@
     '$location',
     '$routeParams',
     'horizon.app.core.openstack-service-api.magnum',
-    'horizon.dashboard.containers.bays.events',
+    'horizon.dashboard.container-infra.bays.events',
     'horizon.framework.conf.resource-type-registry.service',
-    'horizon.dashboard.containers.bays.resourceType'
+    'horizon.dashboard.container-infra.bays.resourceType'
   ];
 
   function BayDetailController(
@@ -72,4 +72,4 @@
       deleteWatcher();
     }
   }
-})();
\ No newline at end of file
+})();
diff --git a/magnum_ui/static/dashboard/containers/bays/detail/detail.html b/magnum_ui/static/dashboard/container-infra/bays/detail/detail.html
similarity index 100%
rename from magnum_ui/static/dashboard/containers/bays/detail/detail.html
rename to magnum_ui/static/dashboard/container-infra/bays/detail/detail.html
diff --git a/magnum_ui/static/dashboard/containers/bays/table/table.controller.js b/magnum_ui/static/dashboard/container-infra/bays/table/table.controller.js
similarity index 85%
rename from magnum_ui/static/dashboard/containers/bays/table/table.controller.js
rename to magnum_ui/static/dashboard/container-infra/bays/table/table.controller.js
index 6a2a965a..c39fb6d0 100644
--- a/magnum_ui/static/dashboard/containers/bays/table/table.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/bays/table/table.controller.js
@@ -19,26 +19,26 @@
 
   /**
    * @ngdoc overview
-   * @name containersBaysTableController
+   * @name BaysTableController
    * @ngController
    *
    * @description
-   * Controller for the containers bay table
+   * Controller for the container-infra bay table
    */
   angular
-    .module('horizon.dashboard.containers.bays')
-    .controller('containersBaysTableController', containersBaysTableController);
+    .module('horizon.dashboard.container-infra.bays')
+    .controller('BaysTableController', BaysTableController);
 
-  containersBaysTableController.$inject = [
+  BaysTableController.$inject = [
     '$scope',
     '$location',
     'horizon.app.core.openstack-service-api.magnum',
-    'horizon.dashboard.containers.bays.events',
+    'horizon.dashboard.container-infra.bays.events',
     'horizon.framework.conf.resource-type-registry.service',
-    'horizon.dashboard.containers.bays.resourceType'
+    'horizon.dashboard.container-infra.bays.resourceType'
   ];
 
-  function containersBaysTableController($scope, $location, magnum, events, registry, bayResourceType) {
+  function BaysTableController($scope, $location, magnum, events, registry, bayResourceType) {
     var ctrl = this;
     ctrl.bays = [];
     ctrl.baysSrc = [];
diff --git a/magnum_ui/static/dashboard/containers/bays/table/table.html b/magnum_ui/static/dashboard/container-infra/bays/table/table.html
similarity index 98%
rename from magnum_ui/static/dashboard/containers/bays/table/table.html
rename to magnum_ui/static/dashboard/container-infra/bays/table/table.html
index 330062ec..f8204a2f 100644
--- a/magnum_ui/static/dashboard/containers/bays/table/table.html
+++ b/magnum_ui/static/dashboard/container-infra/bays/table/table.html
@@ -1,5 +1,5 @@
 <div>
-  <hz-magic-search-context ng-controller="containersBaysTableController as table"
+  <hz-magic-search-context ng-controller="BaysTableController as table"
     filter-facets="table.bayFacets">
     <hz-magic-search-bar></hz-magic-search-bar>
     <actions class="batch-action" allowed="table.bayResource.batchActions" type="batch"></actions>
@@ -136,4 +136,4 @@
       <tfoot hz-table-footer items="table.bays"></tfoot>
     </table>
   </hz-magic-search-context>
-</div>
\ No newline at end of file
+</div>
diff --git a/magnum_ui/static/dashboard/containers/containers.module.js b/magnum_ui/static/dashboard/container-infra/container-infra.module.js
similarity index 80%
rename from magnum_ui/static/dashboard/containers/containers.module.js
rename to magnum_ui/static/dashboard/container-infra/container-infra.module.js
index 03b746e1..b72a6fd6 100644
--- a/magnum_ui/static/dashboard/containers/containers.module.js
+++ b/magnum_ui/static/dashboard/container-infra/container-infra.module.js
@@ -19,15 +19,15 @@
 
   /**
    * @ngdoc overview
-   * @name horizon.dashboard.containers
+   * @name horizon.dashboard.container-infra
    *
    * @description
-   * Dashboard module to host various containers panels.
+   * Dashboard module to host various container-infra panels.
    */
   angular
-    .module('horizon.dashboard.containers', [
-      'horizon.dashboard.containers.bays',
-      'horizon.dashboard.containers.baymodels',
+    .module('horizon.dashboard.container-infra', [
+      'horizon.dashboard.container-infra.bays',
+      'horizon.dashboard.container-infra.baymodels',
       'ngRoute'
     ])
     .config(config)
@@ -36,8 +36,8 @@
                     '$routeProvider', '$locationProvider'];
 
   function config($provide, $windowProvider, $routeProvider, $locationProvider) {
-    var path = $windowProvider.$get().STATIC_URL + 'dashboard/containers/';
-    $provide.constant('horizon.dashboard.containers.basePath', path);
+    var path = $windowProvider.$get().STATIC_URL + 'dashboard/container-infra/';
+    $provide.constant('horizon.dashboard.container-infra.basePath', path);
 
     $routeProvider
     .when('/project/baymodels', {
diff --git a/magnum_ui/static/dashboard/containers/containers.module.spec.js b/magnum_ui/static/dashboard/container-infra/container-infra.module.spec.js
similarity index 82%
rename from magnum_ui/static/dashboard/containers/containers.module.spec.js
rename to magnum_ui/static/dashboard/container-infra/container-infra.module.spec.js
index 2ca5b369..7ae0488e 100644
--- a/magnum_ui/static/dashboard/containers/containers.module.spec.js
+++ b/magnum_ui/static/dashboard/container-infra/container-infra.module.spec.js
@@ -16,9 +16,9 @@
 (function() {
   'use strict';
 
-  describe('horizon.dashboard.containers', function() {
+  describe('horizon.dashboard.container-infra', function() {
     it('should exist', function() {
-      expect(angular.module('horizon.dashboard.containers')).toBeDefined();
+      expect(angular.module('horizon.dashboard.container-infra')).toBeDefined();
     });
   });
 
diff --git a/magnum_ui/static/dashboard/containers/containers.scss b/magnum_ui/static/dashboard/container-infra/container-infra.scss
similarity index 100%
rename from magnum_ui/static/dashboard/containers/containers.scss
rename to magnum_ui/static/dashboard/container-infra/container-infra.scss
diff --git a/magnum_ui/static/dashboard/containers/magnum.service.js b/magnum_ui/static/dashboard/container-infra/magnum.service.js
similarity index 83%
rename from magnum_ui/static/dashboard/containers/magnum.service.js
rename to magnum_ui/static/dashboard/container-infra/magnum.service.js
index 482f6519..600bae47 100644
--- a/magnum_ui/static/dashboard/containers/magnum.service.js
+++ b/magnum_ui/static/dashboard/container-infra/magnum.service.js
@@ -47,28 +47,28 @@
     //////////
 
     function createBay(params) {
-        return apiService.post('/api/containers/bays/', params)
+        return apiService.post('/api/container-infra/bays/', params)
           .error(function() {
             toastService.add('error', gettext('Unable to create Bay.'));
           });
       }
 
     function getBay(id) {
-      return apiService.get('/api/containers/bays/' + id)
+      return apiService.get('/api/container-infra/bays/' + id)
         .error(function() {
           toastService.add('error', gettext('Unable to retrieve the Bay.'));
         });
     }
 
     function getBays() {
-      return apiService.get('/api/containers/bays/')
+      return apiService.get('/api/container-infra/bays/')
         .error(function() {
           toastService.add('error', gettext('Unable to retrieve the Bays.'));
         });
     }
 
     function deleteBay(id, suppressError) {
-      var promise = apiService.delete('/api/containers/bays/', [id]);
+      var promise = apiService.delete('/api/container-infra/bays/', [id]);
       return suppressError ? promise : promise.error(function() {
         var msg = gettext('Unable to delete the Bay with id: %(id)s');
         toastService.add('error', interpolate(msg, { id: id }, true));
@@ -77,7 +77,7 @@
 
     // FIXME(shu-mutou): Unused for batch-delete in Horizon framework in Feb, 2016.
     function deleteBays(ids) {
-      return apiService.delete('/api/containers/bays/', ids)
+      return apiService.delete('/api/container-infra/bays/', ids)
         .error(function() {
           toastService.add('error', gettext('Unable to delete the Bays.'));
         });
@@ -88,28 +88,28 @@
     ///////////////
 
     function createBaymodel(params) {
-      return apiService.post('/api/containers/baymodels/', params)
+      return apiService.post('/api/container-infra/baymodels/', params)
         .error(function() {
           toastService.add('error', gettext('Unable to create Baymodel'));
         });
     }
 
     function getBaymodel(id) {
-      return apiService.get('/api/containers/baymodels/' + id)
+      return apiService.get('/api/container-infra/baymodels/' + id)
         .error(function() {
           toastService.add('error', gettext('Unable to retrieve the Baymodel.'));
         });
     }
 
     function getBaymodels() {
-      return apiService.get('/api/containers/baymodels/')
+      return apiService.get('/api/container-infra/baymodels/')
         .error(function() {
           toastService.add('error', gettext('Unable to retrieve the Baymodels.'));
         });
     }
 
     function deleteBaymodel(id, suppressError) {
-      var promise = apiService.delete('/api/containers/baymodels/', [id]);
+      var promise = apiService.delete('/api/container-infra/baymodels/', [id]);
       return suppressError ? promise : promise.error(function() {
         var msg = gettext('Unable to delete the Baymodel with id: %(id)s');
         toastService.add('error', interpolate(msg, { id: id }, true));
@@ -118,7 +118,7 @@
 
     // FIXME(shu-mutou): Unused for batch-delete in Horizon framework in Feb, 2016.
     function deleteBaymodels(ids) {
-      return apiService.delete('/api/containers/baymodels/', ids)
+      return apiService.delete('/api/container-infra/baymodels/', ids)
         .error(function() {
           toastService.add('error', gettext('Unable to delete the Baymodels.'));
         })
diff --git a/magnum_ui/test/api_tests/rest_api_tests.py b/magnum_ui/test/api_tests/rest_api_tests.py
index a9656171..5f83a4e2 100644
--- a/magnum_ui/test/api_tests/rest_api_tests.py
+++ b/magnum_ui/test/api_tests/rest_api_tests.py
@@ -48,7 +48,7 @@ class MagnumRestTestCase(test.TestCase):
 
         self.assertStatusCode(response, 201)
         self.assertEqual(response['location'],
-                         '/api/containers/baymodel/%s' % test_bmodel.uuid)
+                         '/api/container-infra/baymodel/%s' % test_bmodel.uuid)
         client.baymodel_create.assert_called_once_with(request,
                                                        **test_bmodel.to_dict())
 
@@ -87,7 +87,7 @@ class MagnumRestTestCase(test.TestCase):
 
         self.assertStatusCode(response, 201)
         self.assertEqual(response['location'],
-                         '/api/containers/bay/%s' % test_bay.uuid)
+                         '/api/container-infra/bay/%s' % test_bay.uuid)
         client.bay_create.assert_called_once_with(request,
                                                   **test_bay.to_dict())
 
diff --git a/magnum_ui/test/test_data.py b/magnum_ui/test/test_data.py
index cf67b064..67d8f1b6 100644
--- a/magnum_ui/test/test_data.py
+++ b/magnum_ui/test/test_data.py
@@ -16,7 +16,7 @@ from openstack_dashboard.test.test_data import utils
 
 
 def data(TEST):
-    # Test Data Containers
+    # Test Data Container in Horizon
     TEST.baymodels = utils.TestDataContainer()
     TEST.bays = utils.TestDataContainer()