diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index b142d6ee3d..1673092c9e 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -17,7 +17,7 @@ limitations under the License.
 $tagPanelWidth: 56px; // only applies in this file, used for calculations
 
 .mx_LeftPanel {
-    background-color: $roomlist2-bg-color;
+    background-color: $roomlist-bg-color;
     min-width: 260px;
     max-width: 50%;
 
@@ -46,7 +46,7 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations
     // panel, such as the menu options, breadcrumbs, filtering, etc
     .mx_LeftPanel_roomListContainer {
         width: calc(100% - $tagPanelWidth);
-        background-color: $roomlist2-bg-color;
+        background-color: $roomlist-bg-color;
 
         // Create another flexbox (this time a column) for the room list components
         display: flex;
@@ -114,7 +114,7 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations
                 width: 28px;
                 height: 28px;
                 border-radius: 20px;
-                background-color: $roomlist2-button-bg-color;
+                background-color: $roomlist-button-bg-color;
                 position: relative;
                 margin-left: 8px;
 
diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
index 371bab1611..39a3dee30b 100644
--- a/res/css/structures/_RoomSearch.scss
+++ b/res/css/structures/_RoomSearch.scss
@@ -18,7 +18,7 @@ limitations under the License.
 .mx_RoomSearch {
     flex: 1;
     border-radius: 20px;
-    background-color: $roomlist2-button-bg-color;
+    background-color: $roomlist-button-bg-color;
     height: 28px;
     padding: 2px;
 
diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss
index 02cbdd1574..5b7e1a63e5 100644
--- a/res/css/views/rooms/_RoomSublist.scss
+++ b/res/css/views/rooms/_RoomSublist.scss
@@ -45,7 +45,7 @@ limitations under the License.
         // to work correctly.
         padding-bottom: 8px;
         height: 24px;
-        color: $roomlist2-header-color;
+        color: $roomlist-header-color;
 
         .mx_RoomSublist_stickable {
             flex: 1;
@@ -310,7 +310,7 @@ limitations under the License.
                 width: 32px !important; // !important to override hover styles
                 height: 32px !important; // !important to override hover styles
                 margin-left: 0 !important; // !important to override hover styles
-                background-color: $roomlist2-button-bg-color;
+                background-color: $roomlist-button-bg-color;
                 margin-top: 8px;
 
                 &::before {
@@ -350,7 +350,7 @@ limitations under the License.
 
                 // This is the same color as the left panel background because it needs
                 // to occlude the sublist title
-                background-color: $roomlist2-bg-color;
+                background-color: $roomlist-bg-color;
 
                 &::before {
                     top: 0;
diff --git a/res/css/views/rooms/_RoomTileIcon.scss b/res/css/views/rooms/_RoomTileIcon.scss
index adc8ea2994..2f3afdd446 100644
--- a/res/css/views/rooms/_RoomTileIcon.scss
+++ b/res/css/views/rooms/_RoomTileIcon.scss
@@ -18,7 +18,7 @@ limitations under the License.
     width: 12px;
     height: 12px;
     border-radius: 12px;
-    background-color: $roomlist2-bg-color; // to match the room list itself
+    background-color: $roomlist-bg-color; // to match the room list itself
 }
 
 .mx_RoomTileIcon_globe::before {
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 370c30d4f2..58c313a196 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -114,9 +114,9 @@ $composer-e2e-icon-color: $header-panel-text-primary-color;
 $theme-button-bg-color: #e3e8f0;
 
 
-$roomlist2-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: rgba(33, 38, 44, 0.90);
-$roomlist2-header-color: #8E99A4;
+$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
+$roomlist-bg-color: rgba(33, 38, 44, 0.90);
+$roomlist-header-color: #8E99A4;
 $roomsublist2-divider-color: $primary-fg-color;
 
 $roomtile2-preview-color: #A9B2BC;
@@ -125,7 +125,7 @@ $roomtile2-selected-bg-color: rgba(141, 151, 165, 0.2);
 
 // ********************
 
-$notice-secondary-color: $roomlist2-header-color;
+$notice-secondary-color: $roomlist-header-color;
 
 $roomtile-name-color: $header-panel-text-primary-color;
 $roomtile-selected-color: $text-primary-color;
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 6671afb929..9a7918f1f8 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -112,8 +112,8 @@ $composer-e2e-icon-color: $header-panel-text-primary-color;
 
 $theme-button-bg-color: #e3e8f0;
 
-$roomlist2-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: $header-panel-bg-color;
+$roomlist-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
+$roomlist-bg-color: $header-panel-bg-color;
 
 $roomsublist2-divider-color: $primary-fg-color;
 
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 822b65d57d..a6507332af 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -179,9 +179,9 @@ $header-divider-color: #91a1c0;
 
 $theme-button-bg-color: #e3e8f0;
 
-$roomlist2-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: $header-panel-bg-color;
-$roomlist2-header-color: $primary-fg-color;
+$roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
+$roomlist-bg-color: $header-panel-bg-color;
+$roomlist-header-color: $primary-fg-color;
 $roomsublist2-divider-color: $primary-fg-color;
 
 $roomtile2-preview-color: #9e9e9e;
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index b492006247..6611352f13 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -55,7 +55,7 @@ $interactive-tooltip-bg-color: var(--sidebar-color);
 $tagpanel-bg-color: var(--sidebar-color);
 $tooltip-timeline-bg-color: var(--sidebar-color);
 $dialog-backdrop-color: var(--sidebar-color-50pct);
-$roomlist2-button-bg-color: var(--sidebar-color-15pct);
+$roomlist-button-bg-color: var(--sidebar-color-15pct);
 //
 // --roomlist-background-color
 $header-panel-bg-color: var(--roomlist-background-color);
@@ -70,7 +70,7 @@ $secondary-accent-color: var(--roomlist-background-color);
 $selected-color: var(--roomlist-background-color);
 $widget-menu-bar-bg-color: var(--roomlist-background-color);
 $roomtile-badge-fg-color: var(--roomlist-background-color);
-$roomlist2-bg-color: var(--roomlist-background-color);
+$roomlist-bg-color: var(--roomlist-background-color);
 //
 // --timeline-text-color
 $message-action-bar-fg-color: var(--timeline-text-color);
@@ -95,7 +95,7 @@ $roomtile-selected-color: var(--roomlist-text-color);
 $roomsublist-label-fg-color: var(--roomlist-text-secondary-color);
 $roomtile-name-color: var(--roomlist-text-secondary-color);
 $roomtile2-preview-color: var(--roomlist-text-secondary-color);
-$roomlist2-header-color: var(--roomlist-text-secondary-color);
+$roomlist-header-color: var(--roomlist-text-secondary-color);
 $roomtile2-default-badge-bg-color: var(--roomlist-text-secondary-color);
 
 //
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 657d3bfd13..d895d592f5 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -19,8 +19,8 @@ $accent-bg-color: rgba(3, 179, 129, 0.16);
 $notice-primary-color: #ff4b55;
 $notice-primary-bg-color: rgba(255, 75, 85, 0.16);
 $primary-fg-color: #2e2f32;
-$roomlist2-header-color: $primary-fg-color;
-$notice-secondary-color: $roomlist2-header-color;
+$roomlist-header-color: $primary-fg-color;
+$notice-secondary-color: $roomlist-header-color;
 $header-panel-bg-color: #f3f8fd;
 
 // typical text (dark-on-white in light skin)
@@ -179,8 +179,8 @@ $header-divider-color: #91A1C0;
 
 $theme-button-bg-color: #e3e8f0;
 
-$roomlist2-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: rgba(245, 245, 245, 0.90);
+$roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
+$roomlist-bg-color: rgba(245, 245, 245, 0.90);
 $roomsublist2-divider-color: $primary-fg-color;
 
 $roomtile2-preview-color: #737D8C;