diff --git a/e2e/resources/extensibility-configs/context-submenus-ext.json b/e2e/resources/extensibility-configs/context-submenus-ext.json
index 9c7df193f..d6ad84875 100644
--- a/e2e/resources/extensibility-configs/context-submenus-ext.json
+++ b/e2e/resources/extensibility-configs/context-submenus-ext.json
@@ -46,39 +46,32 @@
   "features": {
     "header": [
       {
-        "id": "app.header.user",
+        "id": "app.user.menu",
         "type": "custom",
-        "component": "app.user",
+        "component": "app.user.menu",
         "order": 100
+      }
+    ],
+    "moreMenu": [
+      {
+        "id": "app.languagePicker",
+        "order": 100,
+        "type": "custom",
+        "component": "app.languagePicker"
       },
       {
-        "id": "app.header.more",
-        "type": "menu",
-        "order": 10000,
-        "icon": "more_vert",
-        "title": "APP.ACTIONS.MORE",
-        "children": [
-          {
-            "id": "app.languagePicker",
-            "order": 100,
-            "type": "custom",
-            "component": "app.languagePicker"
-          },
-          {
-            "id": "logout.separator",
-            "type": "separator",
-            "order": 199
-          },
-          {
-            "id": "app.logout",
-            "order": 200,
-            "type": "custom",
-            "component": "app.logout",
-            "rules": {
-              "visible": "app.canShowLogout"
-            }
-          }
-        ]
+        "id": "logout.separator",
+        "type": "separator",
+        "order": 199
+      },
+      {
+        "id": "app.logout",
+        "order": 200,
+        "type": "custom",
+        "component": "app.logout",
+        "rules": {
+          "visible": "app.canShowLogout"
+        }
       }
     ],
     "icons": [
diff --git a/e2e/resources/extensibility-configs/document-presets-ext.json b/e2e/resources/extensibility-configs/document-presets-ext.json
index 3dcb66676..ca3269e64 100644
--- a/e2e/resources/extensibility-configs/document-presets-ext.json
+++ b/e2e/resources/extensibility-configs/document-presets-ext.json
@@ -46,39 +46,32 @@
   "features": {
     "header": [
       {
-        "id": "app.header.user",
+        "id": "app.user.menu",
         "type": "custom",
-        "component": "app.user",
+        "component": "app.user.menu",
         "order": 100
+      }
+    ],
+    "moreMenu": [
+      {
+        "id": "app.languagePicker",
+        "order": 100,
+        "type": "custom",
+        "component": "app.languagePicker"
       },
       {
-        "id": "app.header.more",
-        "type": "menu",
-        "order": 10000,
-        "icon": "more_vert",
-        "title": "APP.ACTIONS.MORE",
-        "children": [
-          {
-            "id": "app.languagePicker",
-            "order": 100,
-            "type": "custom",
-            "component": "app.languagePicker"
-          },
-          {
-            "id": "logout.separator",
-            "type": "separator",
-            "order": 199
-          },
-          {
-            "id": "app.logout",
-            "order": 200,
-            "type": "custom",
-            "component": "app.logout",
-            "rules": {
-              "visible": "app.canShowLogout"
-            }
-          }
-        ]
+        "id": "logout.separator",
+        "type": "separator",
+        "order": 199
+      },
+      {
+        "id": "app.logout",
+        "order": 200,
+        "type": "custom",
+        "component": "app.logout",
+        "rules": {
+          "visible": "app.canShowLogout"
+        }
       }
     ],
     "icons": [
diff --git a/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json b/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json
index 0cd68e121..0ef5f10ef 100644
--- a/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json
+++ b/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json
@@ -46,39 +46,32 @@
   "features": {
     "header": [
       {
-        "id": "app.header.user",
+        "id": "app.user.menu",
         "type": "custom",
-        "component": "app.user",
+        "component": "app.user.menu",
         "order": 100
+      }
+    ],
+    "moreMenu": [
+      {
+        "id": "app.languagePicker",
+        "order": 100,
+        "type": "custom",
+        "component": "app.languagePicker"
       },
       {
-        "id": "app.header.more",
-        "type": "menu",
-        "order": 10000,
-        "icon": "more_vert",
-        "title": "APP.ACTIONS.MORE",
-        "children": [
-          {
-            "id": "app.languagePicker",
-            "order": 100,
-            "type": "custom",
-            "component": "app.languagePicker"
-          },
-          {
-            "id": "logout.separator",
-            "type": "separator",
-            "order": 199
-          },
-          {
-            "id": "app.logout",
-            "order": 200,
-            "type": "custom",
-            "component": "app.logout",
-            "rules": {
-              "visible": "app.canShowLogout"
-            }
-          }
-        ]
+        "id": "logout.separator",
+        "type": "separator",
+        "order": 199
+      },
+      {
+        "id": "app.logout",
+        "order": 200,
+        "type": "custom",
+        "component": "app.logout",
+        "rules": {
+          "visible": "app.canShowLogout"
+        }
       }
     ],
     "icons": [
diff --git a/e2e/resources/extensibility-configs/metadata-ext.json b/e2e/resources/extensibility-configs/metadata-ext.json
index 31b94c3ec..0be2db60c 100644
--- a/e2e/resources/extensibility-configs/metadata-ext.json
+++ b/e2e/resources/extensibility-configs/metadata-ext.json
@@ -46,39 +46,32 @@
   "features": {
     "header": [
       {
-        "id": "app.header.user",
+        "id": "app.user.menu",
         "type": "custom",
-        "component": "app.user",
+        "component": "app.user.menu",
         "order": 100
+      }
+    ],
+    "moreMenu": [
+      {
+        "id": "app.languagePicker",
+        "order": 100,
+        "type": "custom",
+        "component": "app.languagePicker"
       },
       {
-        "id": "app.header.more",
-        "type": "menu",
-        "order": 10000,
-        "icon": "more_vert",
-        "title": "APP.ACTIONS.MORE",
-        "children": [
-          {
-            "id": "app.languagePicker",
-            "order": 100,
-            "type": "custom",
-            "component": "app.languagePicker"
-          },
-          {
-            "id": "logout.separator",
-            "type": "separator",
-            "order": 199
-          },
-          {
-            "id": "app.logout",
-            "order": 200,
-            "type": "custom",
-            "component": "app.logout",
-            "rules": {
-              "visible": "app.canShowLogout"
-            }
-          }
-        ]
+        "id": "logout.separator",
+        "type": "separator",
+        "order": 199
+      },
+      {
+        "id": "app.logout",
+        "order": 200,
+        "type": "custom",
+        "component": "app.logout",
+        "rules": {
+          "visible": "app.canShowLogout"
+        }
       }
     ],
     "icons": [
diff --git a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.html b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.html
index 36deb38b8..7c8f08fba 100644
--- a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.html
+++ b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.html
@@ -1,14 +1,14 @@
-<button mat-button class="aca-menu-user-details-button" [matMenuTriggerFor]="menu">
+<button mat-button class="aca-user-menu-button" [matMenuTriggerFor]="menu">
   <div>{{ (displayName$ | async)?.initials }}</div>
 </button>
 
 <mat-menu #menu="matMenu" xPosition="before">
-  <div mat-menu-item class="aca-menu-user-details" [routerLink]="['/profile']"
+  <div mat-menu-item class="aca-user-menu" [routerLink]="['/profile']"
     title="{{'APP.TOOLTIPS.MY_PROFILE' | translate}}">
-    <button class="aca-menu-user-details-button">
+    <button class="aca-user-menu-button">
       <div>{{ (displayName$ | async)?.initials }}</div>
     </button>
-    <div class="aca-menu-user-details-name-email">
+    <div class="aca-user-menu-name-email">
       <div>{{ (displayName$ | async)?.firstName }}</div>
       <div>{{ (displayName$ | async)?.email }}</div>
     </div>
diff --git a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss
index 702614baa..dcfefa7fd 100644
--- a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss
+++ b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss
@@ -1,4 +1,4 @@
-.aca-menu-user-details {
+.aca-user-menu {
   display: flex;
   height: 66px;
   align-items: center;
diff --git a/projects/aca-testing-shared/src/components/header/header.ts b/projects/aca-testing-shared/src/components/header/header.ts
index 04bee0950..426f41ac8 100755
--- a/projects/aca-testing-shared/src/components/header/header.ts
+++ b/projects/aca-testing-shared/src/components/header/header.ts
@@ -33,7 +33,7 @@ import { BrowserActions } from '@alfresco/adf-testing';
 
 export class Header extends Component {
   logoLink = this.byCss('.app-menu__title');
-  moreActions = this.byCss('.aca-menu-user-details-button');
+  moreActions = this.byCss('.aca-user-menu-button');
   sidenavToggle = this.byCss(`.sidenav-header-title-logo`);
 
   userInfo = new UserInfo();