diff --git a/packages/cluster-sidebar/src/sidebar-items.injectable.ts b/packages/cluster-sidebar/src/sidebar-items.injectable.ts
index 6cef399fdd..28f045e507 100644
--- a/packages/cluster-sidebar/src/sidebar-items.injectable.ts
+++ b/packages/cluster-sidebar/src/sidebar-items.injectable.ts
@@ -1,26 +1,21 @@
-/* eslint-disable prettier/prettier */
-
-import { getInjectable } from "@ogre-tools/injectable";
+import { getInjectable, InjectionInstanceWithMeta } from "@ogre-tools/injectable";
 import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
-import { HierarchicalSidebarItem, sidebarItemInjectionToken, SidebarItemRegistration } from "./tokens";
+import { SidebarItemDeclaration, sidebarItemInjectionToken, SidebarItemRegistration } from "./tokens";
 import { computed } from "mobx";
 import { byOrderNumber } from "@k8slens/utilities";
 
 const getSidebarItemsHierarchy = (
-  registrations: SidebarItemRegistration[],
+  registrations: InjectionInstanceWithMeta<SidebarItemRegistration>[],
   parentId: string | null,
-): HierarchicalSidebarItem[] => (
+): SidebarItemDeclaration[] =>
   registrations
-    .filter((item) => item.parentId === parentId)
-    .map(({
-      isActive,
-      isVisible,
-      ...registration
-    }) => {
-      const children = getSidebarItemsHierarchy(registrations, registration.id);
+    .filter(({ instance }) => instance.parentId === parentId)
+    .map(({ instance: { isActive, isVisible, ...registration }, meta: { id } }) => {
+      const children = getSidebarItemsHierarchy(registrations, id);
 
       return {
         ...registration,
+        id,
         children,
         isVisible: computed(() => {
           if (children.length === 0) {
@@ -46,8 +41,7 @@ const getSidebarItemsHierarchy = (
         }),
       };
     })
-    .sort(byOrderNumber)
-);
+    .sort(byOrderNumber);
 
 const sidebarItemsInjectable = getInjectable({
   id: "sidebar-items",
@@ -55,7 +49,11 @@ const sidebarItemsInjectable = getInjectable({
     const computedInjectMany = di.inject(computedInjectManyInjectable);
     const sidebarItemRegistrations = computedInjectMany(sidebarItemInjectionToken);
 
-    return computed(() => getSidebarItemsHierarchy(sidebarItemRegistrations.get(), null));
+    return computed(() => {
+      void sidebarItemRegistrations.get();
+
+      return getSidebarItemsHierarchy(di.injectManyWithMeta(sidebarItemInjectionToken), null);
+    });
   },
 });
 
diff --git a/packages/cluster-sidebar/src/tokens.ts b/packages/cluster-sidebar/src/tokens.ts
index 3edbd0468e..fbdab816d2 100644
--- a/packages/cluster-sidebar/src/tokens.ts
+++ b/packages/cluster-sidebar/src/tokens.ts
@@ -8,7 +8,7 @@ import type { IComputedValue } from "mobx";
 import type { StrictReactNode } from "@k8slens/utilities";
 
 export interface SidebarItemRegistration {
-  id: string;
+  id?: undefined;
   parentId: string | null;
   title: StrictReactNode;
   onClick: () => void;
@@ -18,7 +18,7 @@ export interface SidebarItemRegistration {
   orderNumber: number;
 }
 
-export interface SidebarItem {
+export interface SidebarItemDeclaration {
   id: string;
   parentId: string | null;
   title: StrictReactNode;
@@ -26,10 +26,7 @@ export interface SidebarItem {
   getIcon?: () => StrictReactNode;
   isActive: IComputedValue<boolean>;
   isVisible: IComputedValue<boolean>;
-}
-
-export interface HierarchicalSidebarItem extends SidebarItem {
-  children: HierarchicalSidebarItem[];
+  children: SidebarItemDeclaration[];
 }
 
 export const sidebarItemInjectionToken = getInjectionToken<SidebarItemRegistration>({
diff --git a/packages/core/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx b/packages/core/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx
index efc16c8ef2..510a71dd93 100644
--- a/packages/core/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx
+++ b/packages/core/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx
@@ -37,7 +37,7 @@ describe("disable sidebar items when cluster is not relevant", () => {
 
         clusterPageMenus: [
           {
-            id: "some-sidebar-item",
+            id: "sidebar-item-some",
             title: "Some sidebar item",
 
             components: {
@@ -60,7 +60,7 @@ describe("disable sidebar items when cluster is not relevant", () => {
 
     it("does not show the sidebar item", () => {
       const actual = rendered.queryByTestId(
-        "sidebar-item-some-extension-name-some-sidebar-item",
+        "sidebar-item-sidebar-item-some-extension-name-some",
       );
 
       expect(actual).not.toBeInTheDocument();
@@ -78,7 +78,7 @@ describe("disable sidebar items when cluster is not relevant", () => {
 
     it("does not show the sidebar item", () => {
       const actual = rendered.queryByTestId(
-        "sidebar-item-some-extension-name-some-sidebar-item",
+        "sidebar-item-sidebar-item-some-extension-name-some",
       );
 
       expect(actual).not.toBeInTheDocument();
@@ -96,7 +96,7 @@ describe("disable sidebar items when cluster is not relevant", () => {
 
     it("shows the sidebar item", () => {
       const actual = rendered.getByTestId(
-        "sidebar-item-test-extension-some-sidebar-item",
+        "sidebar-item-sidebar-item-test-extension-some",
       );
 
       expect(actual).toBeInTheDocument();
diff --git a/packages/core/src/features/cluster/order-of-sidebar-items.test.tsx b/packages/core/src/features/cluster/order-of-sidebar-items.test.tsx
index 244a2b6960..7d5bb21819 100644
--- a/packages/core/src/features/cluster/order-of-sidebar-items.test.tsx
+++ b/packages/core/src/features/cluster/order-of-sidebar-items.test.tsx
@@ -85,9 +85,8 @@ describe("cluster - order of sidebar items", () => {
 });
 
 const someParentSidebarItemInjectable = getInjectable({
-  id: "some-parent-sidebar-item",
+  id: "sidebar-item-some-parent",
   instantiate: () => ({
-    id: "some-parent-id",
     parentId: null,
     title: "Some parent",
     onClick: noop,
@@ -97,9 +96,8 @@ const someParentSidebarItemInjectable = getInjectable({
 });
 
 const someOtherParentSidebarItemInjectable = getInjectable({
-  id: "some-other-parent-sidebar-item",
+  id: "sidebar-item-some-other-parent",
   instantiate: () => ({
-    id: "some-other-parent-id",
     parentId: null,
     title: "Some other parent",
     onClick: noop,
@@ -109,9 +107,8 @@ const someOtherParentSidebarItemInjectable = getInjectable({
 });
 
 const someAnotherParentSidebarItemInjectable = getInjectable({
-  id: "some-another-parent-sidebar-item",
+  id: "sidebar-item-some-another-parent",
   instantiate: () => ({
-    id: "some-another-parent-id",
     parentId: null,
     title: "Some another parent",
     onClick: noop,
@@ -121,10 +118,9 @@ const someAnotherParentSidebarItemInjectable = getInjectable({
 });
 
 const someChildSidebarItemInjectable = getInjectable({
-  id: "some-child-sidebar-item",
-  instantiate: (di) => ({
-    id: "some-child-id",
-    parentId: di.inject(someParentSidebarItemInjectable).id,
+  id: "sidebar-item-some-child",
+  instantiate: () => ({
+    parentId: someParentSidebarItemInjectable.id,
     title: "Some child",
     onClick: noop,
     orderNumber: 168,
@@ -133,10 +129,9 @@ const someChildSidebarItemInjectable = getInjectable({
 });
 
 const someOtherChildSidebarItemInjectable = getInjectable({
-  id: "some-other-child-sidebar-item",
-  instantiate: (di) => ({
-    id: "some-other-child-id",
-    parentId: di.inject(someParentSidebarItemInjectable).id,
+  id: "sidebar-item-some-other-child",
+  instantiate: () => ({
+    parentId: someParentSidebarItemInjectable.id,
     title: "Some other child",
     onClick: noop,
     orderNumber: 252,
@@ -145,10 +140,9 @@ const someOtherChildSidebarItemInjectable = getInjectable({
 });
 
 const someAnotherChildSidebarItemInjectable = getInjectable({
-  id: "some-another-child-sidebar-item",
-  instantiate: (di) => ({
-    id: "some-another-child-id",
-    parentId: di.inject(someParentSidebarItemInjectable).id,
+  id: "sidebar-item-some-another-child",
+  instantiate: () => ({
+    parentId: someParentSidebarItemInjectable.id,
     title: "Some another child",
     onClick: noop,
     orderNumber: 210,
diff --git a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
index d682e3ca16..7c444074e6 100644
--- a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
+++ b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
@@ -295,9 +295,8 @@ describe("cluster - sidebar and tab navigation for core", () => {
 });
 
 const someParentSidebarItemInjectable = getInjectable({
-  id: "some-parent-sidebar-item",
+  id: "sidebar-item-some-parent",
   instantiate: () => ({
-    id: "some-parent-id",
     parentId: null,
     title: "Some parent",
     onClick: noop,
@@ -308,15 +307,14 @@ const someParentSidebarItemInjectable = getInjectable({
 });
 
 const someChildSidebarItemInjectable = getInjectable({
-  id: "some-child-sidebar-item",
+  id: "sidebar-item-some-child",
   instantiate: (di) => {
     const route = di.inject(testRouteInjectable);
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
     const routeIsActive = di.inject(routeIsActiveInjectable, route);
 
     return {
-      id: "some-child-id",
-      parentId: di.inject(someParentSidebarItemInjectable).id,
+      parentId: someParentSidebarItemInjectable.id,
       title: "Some child",
       onClick: () => navigateToRoute(route),
       isActive: routeIsActive,
diff --git a/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx b/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx
index 4146e25ed7..3ddaff3caa 100644
--- a/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx
+++ b/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx
@@ -27,7 +27,7 @@ describe("cluster - visibility of sidebar items", () => {
       runInAction(() => {
         windowDi.register(testRouteInjectable);
         windowDi.register(testRouteComponentInjectable);
-        windowDi.register(testSidebarItemsInjectable);
+        windowDi.register(testSidebarItemInjectable);
       });
     });
   });
@@ -94,15 +94,14 @@ const testRouteComponentInjectable = getInjectable({
   injectionToken: routeSpecificComponentInjectionToken,
 });
 
-const testSidebarItemsInjectable = getInjectable({
-  id: "some-sidebar-item-injectable",
+const testSidebarItemInjectable = getInjectable({
+  id: "sidebar-item-test",
 
   instantiate: (di) => {
     const testRoute = di.inject(testRouteInjectable);
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
 
     return {
-      id: "some-item-id",
       parentId: null,
       title: "Some item",
       onClick: () => navigateToRoute(testRoute),
diff --git a/packages/core/src/renderer/components/cluster/cluster-overview-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/cluster/cluster-overview-sidebar-item.injectable.tsx
index 6df3a67382..12277f661d 100644
--- a/packages/core/src/renderer/components/cluster/cluster-overview-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/cluster/cluster-overview-sidebar-item.injectable.tsx
@@ -11,13 +11,12 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToClusterOverviewInjectable from "../../../common/front-end-routing/routes/cluster/overview/navigate-to-cluster-overview.injectable";
 
 const clusterOverviewSidebarItemInjectable = getInjectable({
-  id: "cluster-overview-sidebar-item",
+  id: "sidebar-item-cluster-overview",
 
   instantiate: (di) => {
     const route = di.inject(clusterOverviewRouteInjectable);
 
     return {
-      id: "cluster-overview",
       parentId: null,
       title: "Cluster",
       getIcon: () => <Icon svg="kube" />,
diff --git a/packages/core/src/renderer/components/config-horizontal-pod-autoscalers/sidebar-items.injectable.tsx b/packages/core/src/renderer/components/config-horizontal-pod-autoscalers/sidebar-items.injectable.tsx
index 4eb532a63d..0dfdd7f6cc 100644
--- a/packages/core/src/renderer/components/config-horizontal-pod-autoscalers/sidebar-items.injectable.tsx
+++ b/packages/core/src/renderer/components/config-horizontal-pod-autoscalers/sidebar-items.injectable.tsx
@@ -10,14 +10,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToHorizontalPodAutoscalersInjectable from "../../../common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/navigate-to-horizontal-pod-autoscalers.injectable";
 
 const horizontalPodAutoScalersSidebarItemInjectable = getInjectable({
-  id: "horizontal-pod-auto-scalers-sidebar-item",
+  id: "sidebar-item-horizontal-pod-auto-scalers",
 
   instantiate: (di) => {
     const route = di.inject(horizontalPodAutoscalersRouteInjectable);
 
     return {
-      id: "horizontal-pod-auto-scalers",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "HPA",
       onClick: di.inject(navigateToHorizontalPodAutoscalersInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-leases/leases-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-leases/leases-sidebar-item.injectable.tsx
index a21923553f..32de10a5fc 100644
--- a/packages/core/src/renderer/components/config-leases/leases-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-leases/leases-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToLeasesInjectable from "../../../common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable";
 
 const leasesSidebarItemInjectable = getInjectable({
-  id: "leases-sidebar-item",
+  id: "sidebar-item-leases",
 
   instantiate: (di) => {
     const route = di.inject(leasesRouteInjectable);
 
     return {
-      id: "leases",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Leases",
       onClick: di.inject(navigateToLeasesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-limit-ranges/limit-ranges-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-limit-ranges/limit-ranges-sidebar-item.injectable.tsx
index 5486972afe..d9a53712dc 100644
--- a/packages/core/src/renderer/components/config-limit-ranges/limit-ranges-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-limit-ranges/limit-ranges-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToLimitRangesInjectable from "../../../common/front-end-routing/routes/cluster/config/limit-ranges/navigate-to-limit-ranges.injectable";
 
 const limitRangesSidebarItemInjectable = getInjectable({
-  id: "limit-ranges-sidebar-item",
+  id: "sidebar-item-limit-ranges",
 
   instantiate: (di) => {
     const route = di.inject(limitRangesRouteInjectable);
 
     return {
-      id: "limit-ranges",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Limit Ranges",
       onClick: di.inject(navigateToLimitRangesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-maps/config-maps-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-maps/config-maps-sidebar-item.injectable.tsx
index b42c7b87dd..f6540ece63 100644
--- a/packages/core/src/renderer/components/config-maps/config-maps-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-maps/config-maps-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToConfigMapsInjectable from "../../../common/front-end-routing/routes/cluster/config/config-maps/navigate-to-config-maps.injectable";
 
 const configMapsSidebarItemInjectable = getInjectable({
-  id: "config-maps-sidebar-item",
+  id: "sidebar-item-config-maps",
 
   instantiate: (di) => {
     const route = di.inject(configMapsRouteInjectable);
 
     return {
-      id: "config-maps",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "ConfigMaps",
       onClick: di.inject(navigateToConfigMapsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-mutating-webhook-configurations/mutating-webhook-configurations-sidebar-items.injectable.ts b/packages/core/src/renderer/components/config-mutating-webhook-configurations/mutating-webhook-configurations-sidebar-items.injectable.ts
index c393e19169..da0fa9ed06 100644
--- a/packages/core/src/renderer/components/config-mutating-webhook-configurations/mutating-webhook-configurations-sidebar-items.injectable.ts
+++ b/packages/core/src/renderer/components/config-mutating-webhook-configurations/mutating-webhook-configurations-sidebar-items.injectable.ts
@@ -10,14 +10,13 @@ import navigateToMutatingWebhookConfigurationsInjectable from "../../../common/f
 import configSidebarItemInjectable from "../config/config-sidebar-item.injectable";
 
 const mutatingWebhookConfigurationsSidebarItemInjectable = getInjectable({
-  id: "mutating-webhook-configurations-sidebar-item",
+  id: "sidebar-item-mutating-webhook-configurations",
 
   instantiate: (di) => {
     const route = di.inject(mutatingWebhookConfigurationsRouteInjectable);
 
     return {
-      id: "mutating-webhook-configurations",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Mutating Webhook Configs",
       onClick: di.inject(navigateToMutatingWebhookConfigurationsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-pod-disruption-budgets/pod-disruption-budgets-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-pod-disruption-budgets/pod-disruption-budgets-sidebar-item.injectable.tsx
index 0fa3412b9e..e5bcba8f60 100644
--- a/packages/core/src/renderer/components/config-pod-disruption-budgets/pod-disruption-budgets-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-pod-disruption-budgets/pod-disruption-budgets-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToPodDisruptionBudgetsInjectable from "../../../common/front-end-routing/routes/cluster/config/pod-disruption-budgets/navigate-to-pod-disruption-budgets.injectable";
 
 const podDisruptionBudgetsSidebarItemInjectable = getInjectable({
-  id: "pod-disruption-budgets-sidebar-item",
+  id: "sidebar-item-pod-disruption-budgets",
 
   instantiate: (di) => {
     const route = di.inject(podDisruptionBudgetsRouteInjectable);
 
     return {
-      id: "pod-disruption-budgets",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Pod Disruption Budgets",
       onClick: di.inject(navigateToPodDisruptionBudgetsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-priority-classes/priority-classes-items.injectable.tsx b/packages/core/src/renderer/components/config-priority-classes/priority-classes-items.injectable.tsx
index 4231544ba0..09d2863605 100644
--- a/packages/core/src/renderer/components/config-priority-classes/priority-classes-items.injectable.tsx
+++ b/packages/core/src/renderer/components/config-priority-classes/priority-classes-items.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToPriorityClassesInjectable from "../../../common/front-end-routing/routes/cluster/config/priority-classes/navigate-to-priority-classes.injectable";
 
 const priorityClassesSidebarItemInjectable = getInjectable({
-  id: "priority-classes-sidebar-item",
+  id: "sidebar-item-priority-classes",
 
   instantiate: (di) => {
     const route = di.inject(priorityClassesRouteInjectable);
 
     return {
-      id: "priority-classes",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Priority Classes",
       onClick: di.inject(navigateToPriorityClassesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-resource-quotas/resource-quotas-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-resource-quotas/resource-quotas-sidebar-item.injectable.tsx
index 0ff48bd264..16731ead0a 100644
--- a/packages/core/src/renderer/components/config-resource-quotas/resource-quotas-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-resource-quotas/resource-quotas-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToResourceQuotasInjectable from "../../../common/front-end-routing/routes/cluster/config/resource-quotas/navigate-to-resource-quotas.injectable";
 
 const resourceQuotasSidebarItemInjectable = getInjectable({
-  id: "resource-quotas-sidebar-item",
+  id: "sidebar-item-resource-quotas",
 
   instantiate: (di) => {
     const route = di.inject(resourceQuotasRouteInjectable);
 
     return {
-      id: "resource-quotas",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Resource Quotas",
       onClick: di.inject(navigateToResourceQuotasInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-runtime-classes/runtime-classes-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-runtime-classes/runtime-classes-sidebar-item.injectable.tsx
index 95242f99ed..c7908d0865 100644
--- a/packages/core/src/renderer/components/config-runtime-classes/runtime-classes-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-runtime-classes/runtime-classes-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToRuntimeClassesInjectable from "../../../common/front-end-routing/routes/cluster/config/runtime-classes/navigate-to-runtime-classes.injectable";
 
 const runtimeClassesSidebarItemInjectable = getInjectable({
-  id: "runtime-classes-sidebar-item",
+  id: "sidebar-item-runtime-classes",
 
   instantiate: (di) => {
     const route = di.inject(runtimeClassesRouteInjectable);
 
     return {
-      id: "runtime-classes",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Runtime Classes",
       onClick: di.inject(navigateToRuntimeClassesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-secrets/secrets-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-secrets/secrets-sidebar-item.injectable.tsx
index 745572e71a..f8ec25ef58 100644
--- a/packages/core/src/renderer/components/config-secrets/secrets-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-secrets/secrets-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToSecretsInjectable from "../../../common/front-end-routing/routes/cluster/config/secrets/navigate-to-secrets.injectable";
 
 const secretsSidebarItemInjectable = getInjectable({
-  id: "secrets-sidebar-item",
+  id: "sidebar-item-secrets",
 
   instantiate: (di) => {
     const route = di.inject(secretsRouteInjectable);
 
     return {
-      id: "secrets",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Secrets",
       onClick: di.inject(navigateToSecretsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-validating-webhook-configurations/validating-webhook-configurations-sidebar-items.injectable.ts b/packages/core/src/renderer/components/config-validating-webhook-configurations/validating-webhook-configurations-sidebar-items.injectable.ts
index b616d147a2..512c8f9bfd 100644
--- a/packages/core/src/renderer/components/config-validating-webhook-configurations/validating-webhook-configurations-sidebar-items.injectable.ts
+++ b/packages/core/src/renderer/components/config-validating-webhook-configurations/validating-webhook-configurations-sidebar-items.injectable.ts
@@ -10,14 +10,13 @@ import navigateToValidatingWebhookConfigurationsInjectable from "../../../common
 import configSidebarItemInjectable from "../config/config-sidebar-item.injectable";
 
 const validatingWebhookConfigurationsSidebarItemInjectable = getInjectable({
-  id: "validating-webhook-configurations-sidebar-item",
+  id: "sidebar-item-validating-webhook-configurations",
 
   instantiate: (di) => {
     const route = di.inject(validatingWebhookConfigurationsRouteInjectable);
 
     return {
-      id: "validating-webhook-configurations",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "Validating Webhook Configs",
       onClick: di.inject(navigateToValidatingWebhookConfigurationsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-item.injectable.tsx
index e620fe6490..6d16e0c24c 100644
--- a/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-item.injectable.tsx
@@ -10,14 +10,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToVerticalPodAutoscalersInjectable from "../../../common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/navigate-to-vertical-pod-autoscalers.injectable";
 
 const verticalPodAutoScalersSidebarItemInjectable = getInjectable({
-  id: "vertical-pod-auto-scalers-sidebar-item",
+  id: "sidebar-item-vertical-pod-auto-scalers",
 
   instantiate: (di) => {
     const route = di.inject(verticalPodAutoscalersRouteInjectable);
 
     return {
-      id: "vertical-pod-auto-scalers",
-      parentId: di.inject(configSidebarItemInjectable).id,
+      parentId: configSidebarItemInjectable.id,
       title: "VPA",
       onClick: di.inject(navigateToVerticalPodAutoscalersInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/config/config-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config/config-sidebar-item.injectable.tsx
index b642e77afb..2e01f3532e 100644
--- a/packages/core/src/renderer/components/config/config-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/config/config-sidebar-item.injectable.tsx
@@ -9,10 +9,9 @@ import { sidebarItemInjectionToken } from "@k8slens/cluster-sidebar";
 import { noop } from "lodash/fp";
 
 const configSidebarItemInjectable = getInjectable({
-  id: "config-sidebar-item",
+  id: "sidebar-item-config",
 
   instantiate: () => ({
-    id: "config",
     parentId: null,
     title: "Config",
     getIcon: () => <Icon material="list" />,
diff --git a/packages/core/src/renderer/components/custom-resources/custom-resource-definition-groups-sidebar-items-computed.injectable.ts b/packages/core/src/renderer/components/custom-resources/custom-resource-definition-groups-sidebar-items-computed.injectable.ts
index cb753b0370..28dec2e4ab 100644
--- a/packages/core/src/renderer/components/custom-resources/custom-resource-definition-groups-sidebar-items-computed.injectable.ts
+++ b/packages/core/src/renderer/components/custom-resources/custom-resource-definition-groups-sidebar-items-computed.injectable.ts
@@ -27,10 +27,9 @@ const customResourceDefinitionGroupsSidebarItemsComputedInjectable = getInjectab
 
     const toCustomResourceGroupToSidebarItems = ([group, definitions]: [string, CustomResourceDefinition[]], index: number) => {
       const customResourceGroupSidebarItem = getInjectable({
-        id: `custom-resource-group-${group}-sidebar-item`,
-        instantiate: (di): SidebarItemRegistration => ({
-          id: `custom-resource-group-${group}`,
-          parentId: di.inject(customResourcesSidebarItemInjectable).id,
+        id: `sidebar-item-custom-resource-group-${group}`,
+        instantiate: (): SidebarItemRegistration => ({
+          parentId: customResourcesSidebarItemInjectable.id,
           onClick: noop,
           title: group,
           orderNumber: 10 * index,
@@ -44,10 +43,9 @@ const customResourceDefinitionGroupsSidebarItemsComputedInjectable = getInjectab
         };
 
         return getInjectable({
-          id: `custom-resource-group-${group}/${definition.getPluralName()}-sidebar-item`,
+          id: `sidebar-item-custom-resource-group-${group}/${definition.getPluralName()}`,
           instantiate: (di): SidebarItemRegistration => ({
-            id: `custom-resource-group-${group}/${definition.getPluralName()}`,
-            parentId: di.inject(customResourceGroupSidebarItem).id,
+            parentId: customResourceGroupSidebarItem.id,
             onClick: () => navigateToCustomResources(parameters),
             title: definition.getResourceKind(),
             isActive: computedAnd(
diff --git a/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts b/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts
index fae49e28ea..4e504bb95c 100644
--- a/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts
+++ b/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts
@@ -10,13 +10,12 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import customResourcesSidebarItemInjectable from "./custom-resources-sidebar-item.injectable";
 
 const customResourceDefinitionsSidebarItemInjectable = getInjectable({
-  id: "custom-resource-definitions-sidebar-item",
+  id: "sidebar-item-custom-resource-definitions",
   instantiate: (di) => {
     const customResourceDefinitionsRoute = di.inject(customResourceDefinitionsRouteInjectable);
 
     return {
-      id: "custom-resource-definitions",
-      parentId: di.inject(customResourcesSidebarItemInjectable).id,
+      parentId: customResourcesSidebarItemInjectable.id,
       title: "Definitions",
       onClick: di.inject(navigateToCustomResourcesInjectable),
       isActive: di.inject(routeIsActiveInjectable, customResourceDefinitionsRoute),
diff --git a/packages/core/src/renderer/components/custom-resources/custom-resources-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/custom-resources/custom-resources-sidebar-item.injectable.tsx
index 1487d82927..892edc673e 100644
--- a/packages/core/src/renderer/components/custom-resources/custom-resources-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/custom-resources/custom-resources-sidebar-item.injectable.tsx
@@ -9,9 +9,8 @@ import React from "react";
 import { Icon } from "../icon";
 
 const customResourcesSidebarItemInjectable = getInjectable({
-  id: "custom-resources-sidebar-item",
+  id: "sidebar-item-custom-resources",
   instantiate: () => ({
-    id: "custom-resources",
     parentId: null,
     title: "Custom Resources",
     getIcon: () => <Icon material="extension" />,
diff --git a/packages/core/src/renderer/components/events/events-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/events/events-sidebar-item.injectable.tsx
index e3d6eae1fe..4ca774f876 100644
--- a/packages/core/src/renderer/components/events/events-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/events/events-sidebar-item.injectable.tsx
@@ -12,13 +12,12 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToEventsInjectable from "../../../common/front-end-routing/routes/cluster/events/navigate-to-events.injectable";
 
 const eventsSidebarItemInjectable = getInjectable({
-  id: "events-sidebar-item",
+  id: "sidebar-item-events",
 
   instantiate: (di) => {
     const route = di.inject(eventsRouteInjectable);
 
     return {
-      id: "events",
       parentId: null,
       getIcon: () => <Icon material="access_time" />,
       title: "Events",
diff --git a/packages/core/src/renderer/components/helm-charts/helm-charts-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/helm-charts/helm-charts-sidebar-item.injectable.tsx
index 2918a236fe..d0ca6ea895 100644
--- a/packages/core/src/renderer/components/helm-charts/helm-charts-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/helm-charts/helm-charts-sidebar-item.injectable.tsx
@@ -10,14 +10,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToHelmChartsInjectable from "../../../common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable";
 
 const helmChartsSidebarItemInjectable = getInjectable({
-  id: "helm-charts-sidebar-item",
+  id: "sidebar-item-helm-charts",
 
   instantiate: (di) => {
     const route = di.inject(helmChartsRouteInjectable);
 
     return {
-      id: "charts",
-      parentId: di.inject(helmSidebarItemInjectable).id,
+      parentId: helmSidebarItemInjectable.id,
       title: "Charts",
       onClick: di.inject(navigateToHelmChartsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/helm-releases/helm-releases-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/helm-releases/helm-releases-sidebar-item.injectable.tsx
index 5a30555182..3c4d59b1c4 100644
--- a/packages/core/src/renderer/components/helm-releases/helm-releases-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/helm-releases/helm-releases-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToHelmReleasesInjectable from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
 
 const helmReleasesSidebarItemInjectable = getInjectable({
-  id: "helm-releases-sidebar-item",
+  id: "sidebar-item-helm-releases",
 
   instantiate: (di) => {
     const route = di.inject(helmReleasesRouteInjectable);
 
     return {
-      id: "releases",
-      parentId: di.inject(helmSidebarItemInjectable).id,
+      parentId: helmSidebarItemInjectable.id,
       title: "Releases",
       onClick: di.inject(navigateToHelmReleasesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/helm/helm-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/helm/helm-sidebar-item.injectable.tsx
index 4df7f9386a..3a5905cb34 100644
--- a/packages/core/src/renderer/components/helm/helm-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/helm/helm-sidebar-item.injectable.tsx
@@ -9,10 +9,9 @@ import { Icon } from "@k8slens/icon";
 import { noop } from "lodash/fp";
 
 const helmSidebarItemInjectable = getInjectable({
-  id: "helm-sidebar-item",
+  id: "sidebar-item-helm",
 
   instantiate: () => ({
-    id: "helm",
     parentId: null,
     getIcon: () => <Icon svg="helm" />,
     title: "Helm",
diff --git a/packages/core/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx b/packages/core/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx
index ad00dba3f5..59dbad1dfa 100644
--- a/packages/core/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx
+++ b/packages/core/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx
@@ -54,9 +54,8 @@ const extensionSidebarItemRegistratorInjectable = getInjectable({
           : extension.sanitizedExtensionId;
 
         return getInjectable({
-          id: `${id}-sidebar-item`,
+          id: `sidebar-item-${id}`,
           instantiate: () => ({
-            id,
             orderNumber: registration.orderNumber ?? 9999,
 
             parentId: registration.parentId
diff --git a/packages/core/src/renderer/components/layout/siblings-in-tab-layout.tsx b/packages/core/src/renderer/components/layout/siblings-in-tab-layout.tsx
index a69de81c32..27d73c52b7 100644
--- a/packages/core/src/renderer/components/layout/siblings-in-tab-layout.tsx
+++ b/packages/core/src/renderer/components/layout/siblings-in-tab-layout.tsx
@@ -8,7 +8,7 @@ import { observer } from "mobx-react";
 import React from "react";
 import siblingTabsInjectable from "../../routes/sibling-tabs.injectable";
 import { TabLayout } from "./tab-layout-2";
-import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
+import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
 import type { StrictReactNode } from "@k8slens/utilities";
 
 interface SiblingTabLayoutProps {
@@ -17,7 +17,7 @@ interface SiblingTabLayoutProps {
 }
 
 interface Dependencies {
-  tabs: IComputedValue<HierarchicalSidebarItem[]>;
+  tabs: IComputedValue<SidebarItemDeclaration[]>;
 }
 
 const NonInjectedSiblingsInTabLayout = observer(
diff --git a/packages/core/src/renderer/components/layout/sidebar-item.tsx b/packages/core/src/renderer/components/layout/sidebar-item.tsx
index 3f4888574d..f3864a935d 100644
--- a/packages/core/src/renderer/components/layout/sidebar-item.tsx
+++ b/packages/core/src/renderer/components/layout/sidebar-item.tsx
@@ -12,7 +12,7 @@ import { Icon } from "@k8slens/icon";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { SidebarStorageState } from "./sidebar-storage/sidebar-storage.injectable";
 import sidebarStorageInjectable from "./sidebar-storage/sidebar-storage.injectable";
-import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
+import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
 import type { StorageLayer } from "../../utils/storage-helper";
 
 interface Dependencies {
@@ -20,7 +20,7 @@ interface Dependencies {
 }
 
 export interface SidebarItemProps {
-  item: HierarchicalSidebarItem;
+  item: SidebarItemDeclaration;
 }
 
 const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies) => {
@@ -56,7 +56,7 @@ const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies)
   return (
     <div
       className={styles.SidebarItem}
-      data-testid={`sidebar-item-${id}`}
+      data-testid={id}
       data-is-active-test={isActive}
       data-parent-id-test={item.parentId}
     >
@@ -74,7 +74,7 @@ const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies)
             item.onClick();
           }
         }}
-        data-testid={`sidebar-item-link-for-${id}`}
+        data-testid={`link-for-${id}`}
       >
         {item.getIcon?.()}
         <span>{item.title}</span>
@@ -82,7 +82,7 @@ const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies)
           <Icon
             className={styles.expandIcon}
             material={expanded ? "keyboard_arrow_up" : "keyboard_arrow_down"}
-            data-testid={`sidebar-item-expand-icon-for-${id}`}
+            data-testid={`expand-icon-for-${id}`}
           />
         )}
       </NavLink>
diff --git a/packages/core/src/renderer/components/layout/sidebar.tsx b/packages/core/src/renderer/components/layout/sidebar.tsx
index c13be02961..08ab8014b0 100644
--- a/packages/core/src/renderer/components/layout/sidebar.tsx
+++ b/packages/core/src/renderer/components/layout/sidebar.tsx
@@ -12,13 +12,13 @@ import { SidebarItem } from "./sidebar-item";
 import type { CatalogEntityRegistry } from "../../api/catalog/entity/registry";
 import { SidebarCluster } from "./sidebar-cluster";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
+import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
 import { sidebarItemsInjectable } from "@k8slens/cluster-sidebar";
 import type { IComputedValue } from "mobx";
 import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable";
 
 interface Dependencies {
-  sidebarItems: IComputedValue<HierarchicalSidebarItem[]>;
+  sidebarItems: IComputedValue<SidebarItemDeclaration[]>;
   entityRegistry: CatalogEntityRegistry;
 }
 
diff --git a/packages/core/src/renderer/components/layout/tab-layout-2.tsx b/packages/core/src/renderer/components/layout/tab-layout-2.tsx
index 537226b9db..8ac11c8b51 100644
--- a/packages/core/src/renderer/components/layout/tab-layout-2.tsx
+++ b/packages/core/src/renderer/components/layout/tab-layout-2.tsx
@@ -11,10 +11,10 @@ import type { StrictReactNode } from "@k8slens/utilities";
 import { cssNames } from "@k8slens/utilities";
 import { Tab, Tabs } from "../tabs";
 import { ErrorBoundary } from "@k8slens/error-boundary";
-import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
+import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
 
 export interface TabLayoutProps {
-  tabs?: HierarchicalSidebarItem[];
+  tabs?: SidebarItemDeclaration[];
   children?: StrictReactNode;
   scrollable?: boolean;
 }
diff --git a/packages/core/src/renderer/components/namespaces/namespaces-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/namespaces/namespaces-sidebar-item.injectable.tsx
index 510e649d2f..3f483026e2 100644
--- a/packages/core/src/renderer/components/namespaces/namespaces-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/namespaces/namespaces-sidebar-item.injectable.tsx
@@ -11,13 +11,12 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToNamespacesInjectable from "../../../common/front-end-routing/routes/cluster/namespaces/navigate-to-namespaces.injectable";
 
 const namespacesSidebarItemInjectable = getInjectable({
-  id: "namespaces-sidebar-item",
+  id: "sidebar-item-namespaces",
 
   instantiate: (di) => {
     const route = di.inject(namespacesRouteInjectable);
 
     return {
-      id: "namespaces",
       parentId: null,
       getIcon: () => <Icon material="layers" />,
       title: "Namespaces",
diff --git a/packages/core/src/renderer/components/network-endpoints/endpoints-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/network-endpoints/endpoints-sidebar-item.injectable.tsx
index 2df328d7a3..891940c42c 100644
--- a/packages/core/src/renderer/components/network-endpoints/endpoints-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/network-endpoints/endpoints-sidebar-item.injectable.tsx
@@ -10,14 +10,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToEndpointsInjectable from "../../../common/front-end-routing/routes/cluster/network/endpoints/navigate-to-endpoints.injectable";
 
 const endpointsSidebarItemInjectable = getInjectable({
-  id: "endpoints-sidebar-item",
+  id: "sidebar-item-endpoints",
 
   instantiate: (di) => {
     const route = di.inject(endpointsRouteInjectable);
 
     return {
-      id: "endpoints",
-      parentId: di.inject(networkSidebarItemInjectable).id,
+      parentId: networkSidebarItemInjectable.id,
       title: "Endpoints",
       onClick: di.inject(navigateToEndpointsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/network-ingresses/ingress-classes-sidebar-item.injectable.ts b/packages/core/src/renderer/components/network-ingresses/ingress-classes-sidebar-item.injectable.ts
index 9c540321c0..9af5d4b42a 100644
--- a/packages/core/src/renderer/components/network-ingresses/ingress-classes-sidebar-item.injectable.ts
+++ b/packages/core/src/renderer/components/network-ingresses/ingress-classes-sidebar-item.injectable.ts
@@ -10,13 +10,12 @@ import navigateToIngressClassesInjectable from "../../../common/front-end-routin
 import ingressClassesRouteInjectable from "../../../common/front-end-routing/routes/cluster/network/ingress-class/ingress-classes-route.injectable";
 
 const ingressClassesSidebarItemInjectable = getInjectable({
-  id: "ingress-classes-sidebar-item",
+  id: "sidebar-item-ingress-classes",
   instantiate: (di) => {
     const ingressClassRoute = di.inject(ingressClassesRouteInjectable);
 
     return {
-      id: "ingressclasses",
-      parentId: di.inject(networkSidebarItemInjectable).id,
+      parentId: networkSidebarItemInjectable.id,
       title: "Ingress Classes",
       onClick: di.inject(navigateToIngressClassesInjectable),
       isActive: di.inject(routeIsActiveInjectable, ingressClassRoute),
diff --git a/packages/core/src/renderer/components/network-ingresses/ingresses-sidebar-items.injectable.ts b/packages/core/src/renderer/components/network-ingresses/ingresses-sidebar-items.injectable.ts
index e6cd0a2c89..4a66f89f55 100644
--- a/packages/core/src/renderer/components/network-ingresses/ingresses-sidebar-items.injectable.ts
+++ b/packages/core/src/renderer/components/network-ingresses/ingresses-sidebar-items.injectable.ts
@@ -10,13 +10,12 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import networkSidebarItemInjectable from "../network/network-sidebar-item.injectable";
 
 const ingressesSidebarItemInjectable = getInjectable({
-  id: "ingresses-sidebar-item",
+  id: "sidebar-item-ingresses",
   instantiate: (di) => {
     const ingressRoute = di.inject(ingressesRouteInjectable);
 
     return {
-      id: "ingresses",
-      parentId: di.inject(networkSidebarItemInjectable).id,
+      parentId: networkSidebarItemInjectable.id,
       title: "Ingresses",
       onClick: di.inject(navigateToIngressesInjectable),
       isActive: di.inject(routeIsActiveInjectable, ingressRoute),
diff --git a/packages/core/src/renderer/components/network-policies/network-policies-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/network-policies/network-policies-sidebar-item.injectable.tsx
index 099ebe3c06..2bee36c6cf 100644
--- a/packages/core/src/renderer/components/network-policies/network-policies-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/network-policies/network-policies-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToNetworkPoliciesInjectable from "../../../common/front-end-routing/routes/cluster/network/network-policies/navigate-to-network-policies.injectable";
 
 const networkPoliciesSidebarItemInjectable = getInjectable({
-  id: "network-policies-sidebar-item",
+  id: "sidebar-item-network-policies",
 
   instantiate: (di) => {
     const route = di.inject(networkPoliciesRouteInjectable);
 
     return {
-      id: "network-policies",
-      parentId: di.inject(networkSidebarItemInjectable).id,
+      parentId: networkSidebarItemInjectable.id,
       title: "Network Policies",
       onClick: di.inject(navigateToNetworkPoliciesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/network-port-forwards/port-forwards-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/network-port-forwards/port-forwards-sidebar-item.injectable.tsx
index 48ace221b1..a9d883a65f 100644
--- a/packages/core/src/renderer/components/network-port-forwards/port-forwards-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/network-port-forwards/port-forwards-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToPortForwardsInjectable from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable";
 
 const portForwardsSidebarItemInjectable = getInjectable({
-  id: "port-forwards-sidebar-item",
+  id: "sidebar-item-port-forwards",
 
   instantiate: (di) => {
     const route = di.inject(portForwardsRouteInjectable);
 
     return {
-      id: "port-forwards",
-      parentId: di.inject(networkSidebarItemInjectable).id,
+      parentId: networkSidebarItemInjectable.id,
       title: "Port Forwarding",
       onClick: di.inject(navigateToPortForwardsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/network-services/services-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/network-services/services-sidebar-item.injectable.tsx
index 37006f2932..12c2d44044 100644
--- a/packages/core/src/renderer/components/network-services/services-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/network-services/services-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToServicesInjectable from "../../../common/front-end-routing/routes/cluster/network/services/navigate-to-services.injectable";
 
 const servicesSidebarItemInjectable = getInjectable({
-  id: "services-sidebar-item",
+  id: "sidebar-item-services",
 
   instantiate: (di) => {
     const route = di.inject(servicesRouteInjectable);
 
     return {
-      id: "services",
-      parentId: di.inject(networkSidebarItemInjectable).id,
+      parentId: networkSidebarItemInjectable.id,
       title: "Services",
       onClick: di.inject(navigateToServicesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/network/network-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/network/network-sidebar-item.injectable.tsx
index c8be2d682a..153ec2cf38 100644
--- a/packages/core/src/renderer/components/network/network-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/network/network-sidebar-item.injectable.tsx
@@ -9,10 +9,9 @@ import React from "react";
 import { noop } from "lodash/fp";
 
 const networkSidebarItemInjectable = getInjectable({
-  id: "network-sidebar-item",
+  id: "sidebar-item-network",
 
   instantiate: () => ({
-    id: "network",
     parentId: null,
     getIcon: () => <Icon material="device_hub" />,
     title: "Network",
diff --git a/packages/core/src/renderer/components/nodes/nodes-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/nodes/nodes-sidebar-item.injectable.tsx
index f931092fa1..f6ae29809c 100644
--- a/packages/core/src/renderer/components/nodes/nodes-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/nodes/nodes-sidebar-item.injectable.tsx
@@ -12,13 +12,12 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToNodesInjectable from "../../../common/front-end-routing/routes/cluster/nodes/navigate-to-nodes.injectable";
 
 const nodesSidebarItemInjectable = getInjectable({
-  id: "nodes-sidebar-item",
+  id: "sidebar-item-nodes",
 
   instantiate: (di) => {
     const route = di.inject(nodesRouteInjectable);
 
     return {
-      id: "nodes",
       parentId: null,
       getIcon: () => <Icon svg="nodes" />,
       title: "Nodes",
diff --git a/packages/core/src/renderer/components/pod-security-policies/pod-security-policies-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/pod-security-policies/pod-security-policies-sidebar-item.injectable.tsx
index 23c4686aa6..357ca2ab73 100644
--- a/packages/core/src/renderer/components/pod-security-policies/pod-security-policies-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/pod-security-policies/pod-security-policies-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import navigateToPodSecurityPoliciesInjectable from "../../../common/front-end-r
 import userManagementSidebarItemInjectable from "../user-management/user-management-sidebar-item.injectable";
 
 const podSecurityPoliciesSidebarItemInjectable = getInjectable({
-  id: "pod-security-policies-sidebar-item",
+  id: "sidebar-item-pod-security-policies",
 
   instantiate: (di) => {
     const route = di.inject(podSecurityPoliciesRouteInjectable);
 
     return {
-      id: "pod-security-policies",
-      parentId: di.inject(userManagementSidebarItemInjectable).id,
+      parentId: userManagementSidebarItemInjectable.id,
       title: "Pod Security Policies",
       onClick: di.inject(navigateToPodSecurityPoliciesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/storage-classes/storage-classes-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/storage-classes/storage-classes-sidebar-item.injectable.tsx
index bfe3c0cea7..ed70afe7e4 100644
--- a/packages/core/src/renderer/components/storage-classes/storage-classes-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/storage-classes/storage-classes-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToStorageClassesInjectable from "../../../common/front-end-routing/routes/cluster/storage/storage-classes/navigate-to-storage-classes.injectable";
 
 const storageClassesSidebarItemInjectable = getInjectable({
-  id: "storage-classes-sidebar-item",
+  id: "sidebar-item-storage-classes",
 
   instantiate: (di) => {
     const route = di.inject(storageClassesRouteInjectable);
 
     return {
-      id: "storage-classes",
-      parentId: di.inject(storageSidebarItemInjectable).id,
+      parentId: storageSidebarItemInjectable.id,
       title: "Storage Classes",
       onClick: di.inject(navigateToStorageClassesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/storage-volume-claims/persistent-volume-claims-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/storage-volume-claims/persistent-volume-claims-sidebar-item.injectable.tsx
index 2f8c46490c..4217b1f0e2 100644
--- a/packages/core/src/renderer/components/storage-volume-claims/persistent-volume-claims-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/storage-volume-claims/persistent-volume-claims-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToPersistentVolumeClaimsInjectable from "../../../common/front-end-routing/routes/cluster/storage/persistent-volume-claims/navigate-to-persistent-volume-claims.injectable";
 
 const persistentVolumeClaimsSidebarItemInjectable = getInjectable({
-  id: "persistent-volume-claims-sidebar-item",
+  id: "sidebar-item-persistent-volume-claims",
 
   instantiate: (di) => {
     const route = di.inject(persistentVolumeClaimsRouteInjectable);
 
     return {
-      id: "persistent-volume-claims",
-      parentId: di.inject(storageSidebarItemInjectable).id,
+      parentId: storageSidebarItemInjectable.id,
       title: "Persistent Volume Claims",
       onClick: di.inject(navigateToPersistentVolumeClaimsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/storage-volumes/persistent-volumes-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/storage-volumes/persistent-volumes-sidebar-item.injectable.tsx
index f5e9dabee0..9a592c7f88 100644
--- a/packages/core/src/renderer/components/storage-volumes/persistent-volumes-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/storage-volumes/persistent-volumes-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToPersistentVolumesInjectable from "../../../common/front-end-routing/routes/cluster/storage/persistent-volumes/navigate-to-persistent-volumes.injectable";
 
 const persistentVolumesSidebarItemInjectable = getInjectable({
-  id: "persistent-volumes-sidebar-item",
+  id: "sidebar-item-persistent-volumes",
 
   instantiate: (di) => {
     const route = di.inject(persistentVolumesRouteInjectable);
 
     return {
-      id: "persistent-volumes",
-      parentId: di.inject(storageSidebarItemInjectable).id,
+      parentId: storageSidebarItemInjectable.id,
       title: "Persistent Volumes",
       onClick: di.inject(navigateToPersistentVolumesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/storage/storage-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/storage/storage-sidebar-item.injectable.tsx
index 482d490668..9bdf3a5678 100644
--- a/packages/core/src/renderer/components/storage/storage-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/storage/storage-sidebar-item.injectable.tsx
@@ -9,10 +9,9 @@ import React from "react";
 import { noop } from "lodash/fp";
 
 const storageSidebarItemInjectable = getInjectable({
-  id: "storage-sidebar-item",
+  id: "sidebar-item-storage",
 
   instantiate: () => ({
-    id: "storage",
     parentId: null,
     getIcon: () => <Icon material="storage" />,
     title: "Storage",
diff --git a/packages/core/src/renderer/components/user-management/cluster-role-bindings/cluster-role-bindings-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/user-management/cluster-role-bindings/cluster-role-bindings-sidebar-item.injectable.tsx
index 29ec04229a..009d7fd256 100644
--- a/packages/core/src/renderer/components/user-management/cluster-role-bindings/cluster-role-bindings-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/user-management/cluster-role-bindings/cluster-role-bindings-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import navigateToClusterRoleBindingsInjectable from "../../../../common/front-en
 import userManagementSidebarItemInjectable from "../user-management-sidebar-item.injectable";
 
 const clusterRoleBindingsSidebarItemInjectable = getInjectable({
-  id: "cluster-role-bindings-sidebar-item",
+  id: "sidebar-item-cluster-role-bindings",
 
   instantiate: (di) => {
     const route = di.inject(clusterRoleBindingsRouteInjectable);
 
     return {
-      id: "cluster-role-bindings",
-      parentId: di.inject(userManagementSidebarItemInjectable).id,
+      parentId: userManagementSidebarItemInjectable.id,
       title: "Cluster Role Bindings",
       onClick: di.inject(navigateToClusterRoleBindingsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/user-management/cluster-roles/cluster-roles-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/user-management/cluster-roles/cluster-roles-sidebar-item.injectable.tsx
index 0c7ca2103b..9926231120 100644
--- a/packages/core/src/renderer/components/user-management/cluster-roles/cluster-roles-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/user-management/cluster-roles/cluster-roles-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../../routes/route-is-active.injectable"
 import navigateToClusterRolesInjectable from "../../../../common/front-end-routing/routes/cluster/user-management/cluster-roles/navigate-to-cluster-roles.injectable";
 
 const clusterRolesSidebarItemInjectable = getInjectable({
-  id: "cluster-roles-sidebar-item",
+  id: "sidebar-item-cluster-roles",
 
   instantiate: (di) => {
     const route = di.inject(clusterRolesRouteInjectable);
 
     return {
-      id: "cluster-roles",
-      parentId: di.inject(userManagementSidebarItemInjectable).id,
+      parentId: userManagementSidebarItemInjectable.id,
       title: "Cluster Roles",
       onClick: di.inject(navigateToClusterRolesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/user-management/role-bindings/role-bindings-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/user-management/role-bindings/role-bindings-sidebar-item.injectable.tsx
index f4c4fa9c7a..8fe66b884c 100644
--- a/packages/core/src/renderer/components/user-management/role-bindings/role-bindings-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/user-management/role-bindings/role-bindings-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../../routes/route-is-active.injectable"
 import navigateToRoleBindingsInjectable from "../../../../common/front-end-routing/routes/cluster/user-management/role-bindings/navigate-to-role-bindings.injectable";
 
 const roleBindingsSidebarItemInjectable = getInjectable({
-  id: "role-bindings-sidebar-item",
+  id: "sidebar-item-role-bindings",
 
   instantiate: (di) => {
     const route = di.inject(roleBindingsRouteInjectable);
 
     return {
-      id: "role-bindings",
-      parentId: di.inject(userManagementSidebarItemInjectable).id,
+      parentId: userManagementSidebarItemInjectable.id,
       title: "Role Bindings",
       onClick: di.inject(navigateToRoleBindingsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/user-management/roles/roles-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/user-management/roles/roles-sidebar-item.injectable.tsx
index bdc47bde86..c12db9ada2 100644
--- a/packages/core/src/renderer/components/user-management/roles/roles-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/user-management/roles/roles-sidebar-item.injectable.tsx
@@ -10,14 +10,13 @@ import routeIsActiveInjectable from "../../../routes/route-is-active.injectable"
 import navigateToRolesInjectable from "../../../../common/front-end-routing/routes/cluster/user-management/roles/navigate-to-roles.injectable";
 
 const rolesSidebarItemInjectable = getInjectable({
-  id: "roles-sidebar-item",
+  id: "sidebar-item-roles",
 
   instantiate: (di) => {
     const route = di.inject(rolesRouteInjectable);
 
     return {
-      id: "roles",
-      parentId: di.inject(userManagementSidebarItemInjectable).id,
+      parentId: userManagementSidebarItemInjectable.id,
       title: "Roles",
       onClick: di.inject(navigateToRolesInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/user-management/service-accounts/service-accounts-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/user-management/service-accounts/service-accounts-sidebar-item.injectable.tsx
index 07b5a39025..23a0562785 100644
--- a/packages/core/src/renderer/components/user-management/service-accounts/service-accounts-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/user-management/service-accounts/service-accounts-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../../routes/route-is-active.injectable"
 import navigateToServiceAccountsInjectable from "../../../../common/front-end-routing/routes/cluster/user-management/service-accounts/navigate-to-service-accounts.injectable";
 
 const serviceAccountsSidebarItemInjectable = getInjectable({
-  id: "service-accounts-sidebar-item",
+  id: "sidebar-item-service-accounts",
 
   instantiate: (di) => {
     const route = di.inject(serviceAccountsRouteInjectable);
 
     return {
-      id: "service-accounts",
-      parentId: di.inject(userManagementSidebarItemInjectable).id,
+      parentId: userManagementSidebarItemInjectable.id,
       title: "Service Accounts",
       onClick: di.inject(navigateToServiceAccountsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/user-management/user-management-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/user-management/user-management-sidebar-item.injectable.tsx
index 1a392d8790..2111f2c79f 100644
--- a/packages/core/src/renderer/components/user-management/user-management-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/user-management/user-management-sidebar-item.injectable.tsx
@@ -9,10 +9,9 @@ import React from "react";
 import { noop } from "lodash/fp";
 
 const userManagementSidebarItemInjectable = getInjectable({
-  id: "user-management-sidebar-item",
+  id: "sidebar-item-user-management",
 
   instantiate: () => ({
-    id: "user-management",
     parentId: null,
     getIcon: () => <Icon material="security" />,
     title: "Access Control",
diff --git a/packages/core/src/renderer/components/workloads-cronjobs/cron-jobs-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-cronjobs/cron-jobs-sidebar-item.injectable.tsx
index b6b2698e3a..ea3f6c56f2 100644
--- a/packages/core/src/renderer/components/workloads-cronjobs/cron-jobs-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-cronjobs/cron-jobs-sidebar-item.injectable.tsx
@@ -10,14 +10,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToCronJobsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/cron-jobs/navigate-to-cron-jobs.injectable";
 
 const cronJobsSidebarItemInjectable = getInjectable({
-  id: "cron-jobs-sidebar-item",
+  id: "sidebar-item-cron-jobs",
 
   instantiate: (di) => {
     const route = di.inject(cronJobsRouteInjectable);
 
     return {
-      id: "cron-jobs",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "CronJobs",
       onClick: di.inject(navigateToCronJobsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-daemonsets/daemonsets-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-daemonsets/daemonsets-sidebar-item.injectable.tsx
index 9a59dcee0c..34e1b89764 100644
--- a/packages/core/src/renderer/components/workloads-daemonsets/daemonsets-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-daemonsets/daemonsets-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToDaemonsetsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/daemonsets/navigate-to-daemonsets.injectable";
 
 const daemonsetsSidebarItemInjectable = getInjectable({
-  id: "daemonsets-sidebar-item",
+  id: "sidebar-item-daemonsets",
 
   instantiate: (di) => {
     const route = di.inject(daemonsetsRouteInjectable);
 
     return {
-      id: "daemon-sets",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "DaemonSets",
       onClick: di.inject(navigateToDaemonsetsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-deployments/deployments-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-deployments/deployments-sidebar-item.injectable.tsx
index 81873a679b..413fd9b3da 100644
--- a/packages/core/src/renderer/components/workloads-deployments/deployments-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-deployments/deployments-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToDeploymentsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/deployments/navigate-to-deployments.injectable";
 
 const deploymentsSidebarItemInjectable = getInjectable({
-  id: "deployments-sidebar-item",
+  id: "sidebar-item-deployments",
 
   instantiate: (di) => {
     const route = di.inject(deploymentsRouteInjectable);
 
     return {
-      id: "deployments",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "Deployments",
       onClick: di.inject(navigateToDeploymentsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-jobs/jobs-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-jobs/jobs-sidebar-item.injectable.tsx
index 0c478db80f..b77157da65 100644
--- a/packages/core/src/renderer/components/workloads-jobs/jobs-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-jobs/jobs-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToJobsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/jobs/navigate-to-jobs.injectable";
 
 const jobsSidebarItemInjectable = getInjectable({
-  id: "jobs-sidebar-item",
+  id: "sidebar-item-jobs",
 
   instantiate: (di) => {
     const route = di.inject(jobsRouteInjectable);
 
     return {
-      id: "jobs",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "Jobs",
       onClick: di.inject(navigateToJobsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-overview/workloads-overview-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-overview/workloads-overview-sidebar-item.injectable.tsx
index e110966cf3..5a9f175a34 100644
--- a/packages/core/src/renderer/components/workloads-overview/workloads-overview-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-overview/workloads-overview-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToWorkloadsOverviewInjectable from "../../../common/front-end-routing/routes/cluster/workloads/overview/navigate-to-workloads-overview.injectable";
 
 const workloadsOverviewSidebarItemInjectable = getInjectable({
-  id: "workloads-overview-sidebar-item",
+  id: "sidebar-item-workloads-overview",
 
   instantiate: (di) => {
     const route = di.inject(workloadsOverviewRouteInjectable);
 
     return {
-      id: "overview",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "Overview",
       onClick: di.inject(navigateToWorkloadsOverviewInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-pods/pods-sidebar-items.injectable.ts b/packages/core/src/renderer/components/workloads-pods/pods-sidebar-items.injectable.ts
index 0e4acfc621..40a2c4c5a0 100644
--- a/packages/core/src/renderer/components/workloads-pods/pods-sidebar-items.injectable.ts
+++ b/packages/core/src/renderer/components/workloads-pods/pods-sidebar-items.injectable.ts
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToPodsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/pods/navigate-to-pods.injectable";
 
 const podsSidebarItemInjectable = getInjectable({
-  id: "pods-sidebar-item",
+  id: "sidebar-item-pods",
 
   instantiate: (di) => {
     const route = di.inject(podsRouteInjectable);
 
     return {
-      id: "pods",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "Pods",
       onClick: di.inject(navigateToPodsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-replicasets/replicasets-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-replicasets/replicasets-sidebar-item.injectable.tsx
index d9d1184acb..67b17c776a 100644
--- a/packages/core/src/renderer/components/workloads-replicasets/replicasets-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-replicasets/replicasets-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToReplicasetsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/replicasets/navigate-to-replicasets.injectable";
 
 const replicasetsSidebarItemInjectable = getInjectable({
-  id: "replicasets-sidebar-item",
+  id: "sidebar-item-replicasets",
 
   instantiate: (di) => {
     const route = di.inject(replicasetsRouteInjectable);
 
     return {
-      id: "replica-sets",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "ReplicaSets",
       onClick: di.inject(navigateToReplicasetsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-sidebar-item.injectable.tsx
index ee346e90e5..c33c741bd7 100644
--- a/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-sidebar-item.injectable.tsx
@@ -10,14 +10,13 @@ import replicationControllersRouteInjectable from "../../../common/front-end-rou
 import navigateToReplicationControllersInjectable from "../../../common/front-end-routing/routes/cluster/workloads/replication-controllers/navigate-to.injectable";
 
 const replicationControllerSidebarItemInjectable = getInjectable({
-  id: "replication-controller-sidebar-item",
+  id: "sidebar-item-replication-controller",
 
   instantiate: (di) => {
     const route = di.inject(replicationControllersRouteInjectable);
 
     return {
-      id: "replication-controllers",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "Replication Controllers",
       onClick: di.inject(navigateToReplicationControllersInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads-statefulsets/statefulsets-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-statefulsets/statefulsets-sidebar-item.injectable.tsx
index a11a5f7db6..d9f23fb35e 100644
--- a/packages/core/src/renderer/components/workloads-statefulsets/statefulsets-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads-statefulsets/statefulsets-sidebar-item.injectable.tsx
@@ -11,14 +11,13 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
 import navigateToStatefulsetsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/statefulsets/navigate-to-statefulsets.injectable";
 
 const statefulsetsSidebarItemInjectable = getInjectable({
-  id: "statefulsets-sidebar-item",
+  id: "sidebar-item-statefulsets",
 
   instantiate: (di) => {
     const route = di.inject(statefulsetsRouteInjectable);
 
     return {
-      id: "stateful-sets",
-      parentId: di.inject(workloadsSidebarItemInjectable).id,
+      parentId: workloadsSidebarItemInjectable.id,
       title: "StatefulSets",
       onClick: di.inject(navigateToStatefulsetsInjectable),
       isActive: di.inject(routeIsActiveInjectable, route),
diff --git a/packages/core/src/renderer/components/workloads/workloads-sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads/workloads-sidebar-item.injectable.tsx
index b3df7593d8..e904e34ca2 100644
--- a/packages/core/src/renderer/components/workloads/workloads-sidebar-item.injectable.tsx
+++ b/packages/core/src/renderer/components/workloads/workloads-sidebar-item.injectable.tsx
@@ -9,10 +9,9 @@ import React from "react";
 import { noop } from "lodash/fp";
 
 const workloadsSidebarItemInjectable = getInjectable({
-  id: "workloads-sidebar-item",
+  id: "sidebar-item-workloads",
 
   instantiate: () => ({
-    id: "workloads",
     parentId: null,
     title: "Workloads",
     getIcon: () => <Icon svg="workloads" />,