diff --git a/Assets/settings-default.json b/Assets/settings-default.json
index 37d85a50..920bb69a 100644
--- a/Assets/settings-default.json
+++ b/Assets/settings-default.json
@@ -28,7 +28,7 @@
       ],
       "right": [
         {
-          "id": "ScreenRecorderIndicator"
+          "id": "ScreenRecorder"
         },
         {
           "id": "Tray"
@@ -58,7 +58,7 @@
           "id": "Clock"
         },
         {
-          "id": "SidePanelToggle"
+          "id": "ControlCenter"
         }
       ]
     }
diff --git a/Commons/Settings.qml b/Commons/Settings.qml
index 65428b6a..04359571 100644
--- a/Commons/Settings.qml
+++ b/Commons/Settings.qml
@@ -142,7 +142,7 @@ Singleton {
             "id": "Workspace"
           }]
         property list<var> right: [{
-            "id": "ScreenRecorderIndicator"
+            "id": "ScreenRecorder"
           }, {
             "id": "Tray"
           }, {
@@ -162,7 +162,7 @@ Singleton {
           }, {
             "id": "Clock"
           }, {
-            "id": "SidePanelToggle"
+            "id": "ControlCenter"
           }]
       }
     }
@@ -386,18 +386,18 @@ Singleton {
         var widget = adapter.bar.widgets[sectionName][i]
 
         switch (widget.id) {
-          case "DarkModeToggle":
-            widget.id = "DarkMode"
-            break;
-          case "PowerToggle":
-            widget.id = "SessionMenu"
-            break;
-          case "ScreenRecorderIndicator":
-            widget.id = "ScreenRecorder"
-            break;
-          case "SidePanelToggle":
-            widget.id = "ControlCenter"
-            break;
+        case "DarkModeToggle":
+          widget.id = "DarkMode"
+          break
+        case "PowerToggle":
+          widget.id = "SessionMenu"
+          break
+        case "ScreenRecorderIndicator":
+          widget.id = "ScreenRecorder"
+          break
+        case "SidePanelToggle":
+          widget.id = "ControlCenter"
+          break
         }
       }
     }
diff --git a/Modules/Bar/Widgets/SessionMenu.qml b/Modules/Bar/Widgets/SessionMenu.qml
index 9df6c452..38ee93dd 100644
--- a/Modules/Bar/Widgets/SessionMenu.qml
+++ b/Modules/Bar/Widgets/SessionMenu.qml
@@ -14,10 +14,10 @@ NIconButton {
   compact: (Settings.data.bar.density === "compact")
   baseSize: Style.capsuleHeight
   icon: "power"
-  tooltipText: "Power panel"
+  tooltipText: "Session menu"
   colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
   colorFg: Color.mError
   colorBorder: Color.transparent
   colorBorderHover: Color.transparent
-  onClicked: PanelService.getPanel("powerPanel")?.toggle()
+  onClicked: PanelService.getPanel("sessionMenuPanel")?.toggle()
 }
diff --git a/Modules/ControlCenter/Cards/ProfileCard.qml b/Modules/ControlCenter/Cards/ProfileCard.qml
index efff07b3..d7aa4a4e 100644
--- a/Modules/ControlCenter/Cards/ProfileCard.qml
+++ b/Modules/ControlCenter/Cards/ProfileCard.qml
@@ -66,9 +66,9 @@ NBox {
       NIconButton {
         id: powerButton
         icon: "power"
-        tooltipText: "Power panel"
+        tooltipText: "Session Menu"
         onClicked: {
-          powerPanel.open()
+          sessionMenuPanel.open()
           controlCenterPanel.close()
         }
       }
diff --git a/Modules/Bar/Power/PowerPanel.qml b/Modules/SessionMenu/SessionMenu.qml
similarity index 99%
rename from Modules/Bar/Power/PowerPanel.qml
rename to Modules/SessionMenu/SessionMenu.qml
index df2381ce..c3de9a59 100644
--- a/Modules/Bar/Power/PowerPanel.qml
+++ b/Modules/SessionMenu/SessionMenu.qml
@@ -263,7 +263,7 @@ NPanel {
         Layout.preferredHeight: Style.baseWidgetSize * 0.8 * scaling
 
         NText {
-          text: timerActive ? `${pendingAction.charAt(0).toUpperCase() + pendingAction.slice(1)} in ${Math.ceil(timeRemaining / 1000)} seconds...` : "Power panel"
+          text: timerActive ? `${pendingAction.charAt(0).toUpperCase() + pendingAction.slice(1)} in ${Math.ceil(timeRemaining / 1000)} seconds...` : "Session Menu"
           font.weight: Style.fontWeightBold
           font.pointSize: Style.fontSizeL * scaling
           color: timerActive ? Color.mPrimary : Color.mOnSurface
diff --git a/Modules/Settings/Bar/BarWidgetSettingsDialog.qml b/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
index 74b34888..86344997 100644
--- a/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
+++ b/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
@@ -126,16 +126,16 @@ Popup {
       "Battery": "WidgetSettings/BatterySettings.qml",
       "Brightness": "WidgetSettings/BrightnessSettings.qml",
       "Clock": "WidgetSettings/ClockSettings.qml",
+      "ControlCenter": "WidgetSettings/ControlCenterSettings.qml",
       "CustomButton": "WidgetSettings/CustomButtonSettings.qml",
       "KeyboardLayout": "WidgetSettings/KeyboardLayoutSettings.qml",
       "MediaMini": "WidgetSettings/MediaMiniSettings.qml",
       "Microphone": "WidgetSettings/MicrophoneSettings.qml",
       "NotificationHistory": "WidgetSettings/NotificationHistorySettings.qml",
-      "Workspace": "WidgetSettings/WorkspaceSettings.qml",
-      "SidePanelToggle": "WidgetSettings/SidePanelToggleSettings.qml",
       "Spacer": "WidgetSettings/SpacerSettings.qml",
       "SystemMonitor": "WidgetSettings/SystemMonitorSettings.qml",
-      "Volume": "WidgetSettings/VolumeSettings.qml"
+      "Volume": "WidgetSettings/VolumeSettings.qml",
+      "Workspace": "WidgetSettings/WorkspaceSettings.qml"
     }
 
     const source = widgetSettingsMap[widgetId]
diff --git a/Services/BarWidgetRegistry.qml b/Services/BarWidgetRegistry.qml
index ba34b8cc..074f362d 100644
--- a/Services/BarWidgetRegistry.qml
+++ b/Services/BarWidgetRegistry.qml
@@ -136,7 +136,7 @@ Singleton {
     CustomButton {}
   }
   property Component darkMode: Component {
-    DarkMode{}
+    DarkMode {}
   }
   property Component keyboardLayoutComponent: Component {
     KeyboardLayout {}
diff --git a/Services/IPCService.qml b/Services/IPCService.qml
index 380222b0..5031bbbc 100644
--- a/Services/IPCService.qml
+++ b/Services/IPCService.qml
@@ -109,19 +109,35 @@ Item {
     }
   }
 
+  // TODO: delete in next major release
   IpcHandler {
     target: "powerPanel"
     function toggle() {
-      powerPanel.toggle()
+      sessionMenuPanel.toggle()
+      ToastService.showWarning("IPC", "PowerPanel has been renamed to SessionMenu, this IPC call will be deprecated soon. Please use \"ipc call sessionMenu toggle\" instead.", 8000)
+    }
+  }
+  IpcHandler {
+    target: "sessionMenu"
+    function toggle() {
+      sessionMenuPanel.toggle()
     }
   }
 
+  // TODO: delete in next major release
   IpcHandler {
-    // TODO: upgrade when breaking changes
     target: "sidePanel"
     function toggle() {
       // Will attempt to open the panel next to the bar button if any.
-      controlCenterPanel.toggle(BarService.lookupWidget("SidePanelToggle"))
+      controlCenterPanel.toggle(BarService.lookupWidget("ControlCenter"))
+      ToastService.showWarning("IPC", "SidePanel has been renamed to ControlCenter, this IPC call will be deprecated soon. Please use \"ipc call controlCenter toggle\" instead.", 8000)
+    }
+  }
+  IpcHandler {
+    target: "controlCenter"
+    function toggle() {
+      // Will attempt to open the panel next to the bar button if any.
+      controlCenterPanel.toggle(BarService.lookupWidget("ControlCenter"))
     }
   }
 
diff --git a/shell.qml b/shell.qml
index 18071540..5d5f9240 100644
--- a/shell.qml
+++ b/shell.qml
@@ -24,13 +24,14 @@ import qs.Widgets
 import qs.Modules.Background
 import qs.Modules.Dock
 import qs.Modules.LockScreen
+import qs.Modules.SessionMenu
 
 // Bar & Bar Components
 import qs.Modules.Bar
 import qs.Modules.Bar.Extras
 import qs.Modules.Bar.Bluetooth
 import qs.Modules.Bar.Calendar
-import qs.Modules.Bar.Power
+
 import qs.Modules.Bar.WiFi
 
 // Panels & UI Components
@@ -60,7 +61,7 @@ ShellRoot {
 
   ToastOverlay {}
 
-  // IPCService is treated as a service 
+  // IPCService is treated as a service
   // but it's actually an Item that needs to exists in the shell.
   IPCService {}
 
@@ -91,9 +92,9 @@ ShellRoot {
     objectName: "notificationHistoryPanel"
   }
 
-  PowerPanel {
-    id: powerPanel
-    objectName: "powerPanel"
+  SessionMenu {
+    id: sessionMenuPanel
+    objectName: "sessionMenuPanel"
   }
 
   WiFiPanel {