diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 8d43b8ffe5..d78ee416ff 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -21,7 +21,7 @@ enabled_tabs:
     - secgroups-tab
     - vrouters-tab
     - zones-tab
-    - oneflow-dashboard
+    - oneflow-dashboard-tab
     - oneflow-services-tab
     - oneflow-templates-tab
     - marketplaces-tab
@@ -470,11 +470,11 @@ tabs:
             VirtualRouter.delete: true
             VirtualRouter.attachnic: true
             VirtualRouter.detachnic: true
-    oneflow-dashboard:
+    oneflow-dashboard-tab:
         panel_tabs:
         table_columns:
         actions:
-    oneflow-services:
+    oneflow-services-tab:
         panel_tabs:
             service_info_tab: true
             service_roles_tab: true
@@ -529,7 +529,7 @@ tabs:
             Service.shutdown: true
             Service.recover: true
             Service.delete: true
-    oneflow-templates:
+    oneflow-templates-tab:
         panel_tabs:
             service_template_info_tab: true
             service_template_roles_tab: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 424ed9d84f..ac990f8643 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -20,7 +20,7 @@ enabled_tabs:
     #- secgroups-tab
     - vrouters-tab
     - zones-tab
-    - oneflow-dashboard
+    - oneflow-dashboard-tab
     - oneflow-services-tab
     - oneflow-templates-tab
     - settings-tab
@@ -461,11 +461,11 @@ tabs:
             VirtualRouter.delete: true
             VirtualRouter.attachnic: true
             VirtualRouter.detachnic: true
-    oneflow-dashboard:
+    oneflow-dashboard-tab:
         panel_tabs:
         table_columns:
         actions:
-    oneflow-services:
+    oneflow-services-tab:
         panel_tabs:
             service_info_tab: true
             service_roles_tab: true
@@ -520,7 +520,7 @@ tabs:
             Service.shutdown: true
             Service.recover: true
             Service.delete: true
-    oneflow-templates:
+    oneflow-templates-tab:
         panel_tabs:
             service_template_info_tab: true
             service_template_roles_tab: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index f3679cbc7e..b828c7648e 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -20,7 +20,7 @@ enabled_tabs:
     - secgroups-tab
     - vrouters-tab
     #- zones-tab
-    - oneflow-dashboard
+    - oneflow-dashboard-tab
     - oneflow-services-tab
     - oneflow-templates-tab
     - marketplaces-tab
@@ -465,11 +465,11 @@ tabs:
             VirtualRouter.delete: true
             VirtualRouter.attachnic: true
             VirtualRouter.detachnic: true
-    oneflow-dashboard:
+    oneflow-dashboard-tab:
         panel_tabs:
         table_columns:
         actions:
-    oneflow-services:
+    oneflow-services-tab:
         panel_tabs:
             service_info_tab: true
             service_roles_tab: true
@@ -524,7 +524,7 @@ tabs:
             Service.shutdown: true
             Service.recover: true
             Service.delete: true
-    oneflow-templates:
+    oneflow-templates-tab:
         panel_tabs:
             service_template_info_tab: true
             service_template_roles_tab: true
diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js
index e2a21a566f..a5796717ea 100644
--- a/src/sunstone/public/app/main.js
+++ b/src/sunstone/public/app/main.js
@@ -139,7 +139,7 @@ require.config({
         'tabs/secgroups-tab',
         'tabs/vrouters-tab',
         'tabs/zones-tab',
-        'tabs/oneflow-dashboard',
+        'tabs/oneflow-dashboard-tab',
         'tabs/oneflow-services-tab',
         'tabs/oneflow-templates-tab',
         'tabs/marketplaces-tab',
diff --git a/src/sunstone/public/app/tabs/oneflow-dashboard.js b/src/sunstone/public/app/tabs/oneflow-dashboard.js
index 3abce46ae1..56bf03a346 100644
--- a/src/sunstone/public/app/tabs/oneflow-dashboard.js
+++ b/src/sunstone/public/app/tabs/oneflow-dashboard.js
@@ -15,7 +15,7 @@
 /* -------------------------------------------------------------------------- */
 
 define(function(require) {
-  var TAB_ID = 'oneflow-dashboard';
+  var TAB_ID = 'oneflow-dashboard-tab';
 
   var Tab = {
     tabId: TAB_ID,
diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab.js b/src/sunstone/public/app/tabs/oneflow-services-tab.js
index 69ab699f5f..85287c3b1a 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab.js
@@ -45,7 +45,7 @@ define(function(require) {
     tabId: TAB_ID,
     title: Locale.tr("Services"),
     tabClass: "subTab",
-    parentTab: "oneflow-dashboard",
+    parentTab: "oneflow-dashboard-tab",
     listHeader: '<i class="fa fa-fw fa-cubes"></i>&emsp;'+Locale.tr("OneFlow - Services"),
     infoHeader: '<i class="fa fa-fw fa-cubes"></i>&emsp;'+Locale.tr("OneFlow - Service"),
     subheader: '',
diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js
index 238b4ff930..c93163030d 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js
@@ -187,7 +187,7 @@ define(function(require) {
 
       this.servicerolesDataTable.initialize();
 
-      Sunstone.insertButtonsInTab("oneflow-services", "service_roles_tab", roles_buttons, $('#role_actions', context));
+      Sunstone.insertButtonsInTab(TAB_ID, "service_roles_tab", roles_buttons, $('#role_actions', context));
     }
   }
 
@@ -299,7 +299,7 @@ define(function(require) {
 
       this.serviceroleVMsDataTable.initialize();
       Sunstone.insertButtonsInTab(
-        "oneflow-services",
+        TAB_ID,
         "service_roles_tab",
         roles_vm_buttons,
         $('div#role_vms_actions', context));
diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js
index 07a1ebf972..fe783eb314 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js
@@ -15,5 +15,5 @@
 /* -------------------------------------------------------------------------- */
 
 define(function(require){
-  return 'oneflow-services';
+  return 'oneflow-services-tab';
 });
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab.js b/src/sunstone/public/app/tabs/oneflow-templates-tab.js
index faee265f8e..a11f0c8d2c 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab.js
@@ -46,7 +46,7 @@ define(function(require) {
     tabId: TAB_ID,
     title: Locale.tr("Templates"),
     tabClass: "subTab",
-    parentTab: "oneflow-dashboard",
+    parentTab: "oneflow-dashboard-tab",
     listHeader: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+Locale.tr("OneFlow - Templates"),
     infoHeader: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+Locale.tr("OneFlow - Template"),
     subheader: '',
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js
index 7716ae980b..9fc10081d1 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js
@@ -15,5 +15,5 @@
 /* -------------------------------------------------------------------------- */
 
 define(function(require){
-  return 'oneflow-templates';
+  return 'oneflow-templates-tab';
 });