diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss
index 07227c1b9a..16cf06dac5 100644
--- a/res/css/views/right_panel/_TimelineCard.scss
+++ b/res/css/views/right_panel/_TimelineCard.scss
@@ -64,7 +64,7 @@ limitations under the License.
         max-width: min(calc(100% - 36px), 600px);
     }
 
-    .mx_GroupLayout .mx_EventTile > .mx_SenderProfile {
+    .mx_GroupLayout .mx_EventTile > .mx_DisambiguatedProfile {
         margin-left: 36px;
     }
 
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 3282ac455b..310465837b 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -112,26 +112,11 @@ $left-gutter: 64px;
         background-color: $header-panel-bg-color;
     }
 
-    .mx_SenderProfile {
-        color: $primary-content;
-        font-size: $font-14px;
-        display: inline-block; /* anti-zalgo, with overflow hidden */
-        overflow: hidden;
-        padding-bottom: 0px;
-        padding-top: 0px;
-        margin: 0px;
-        /* the next three lines, along with overflow hidden, truncate long display names */
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        max-width: calc(100% - $left-gutter);
-    }
-
     .mx_DisambiguatedProfile {
         color: $primary-content;
         font-size: $font-14px;
         display: inline-block; /* anti-zalgo, with overflow hidden */
         overflow: hidden;
-        cursor: pointer;
         padding-bottom: 0px;
         padding-top: 0px;
         margin: 0px;
@@ -331,7 +316,7 @@ $left-gutter: 64px;
     // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
 }
 
-.mx_SenderProfile {
+.mx_DisambiguatedProfile {
     cursor: pointer;
 }
 
@@ -876,7 +861,7 @@ $threadInfoLineHeight: calc(2 * $font-12px);
         left: 0;
     }
 
-    .mx_SenderProfile {
+    .mx_DisambiguatedProfile {
         margin-left: var(--leftOffset) !important;
         flex: 1;
         margin-right: 12px;
@@ -887,19 +872,19 @@ $threadInfoLineHeight: calc(2 * $font-12px);
         max-width: calc(100% - 96px);
     }
 
-    .mx_SenderProfile_displayName,
-    .mx_SenderProfile_mxid {
+    .mx_DisambiguatedProfile_displayName,
+    .mx_DisambiguatedProfile_mxid {
         display: block;
         overflow: hidden;
         text-overflow: ellipsis;
     }
 
-    .mx_SenderProfile_displayName {
+    .mx_DisambiguatedProfile_displayName {
         flex: none;
         max-width: 100%;
     }
 
-    .mx_SenderProfile_mxid {
+    .mx_DisambiguatedProfile_mxid {
         flex: 1;
     }
 
@@ -1020,7 +1005,7 @@ $threadInfoLineHeight: calc(2 * $font-12px);
                 display: flex;
                 align-items: center;
 
-                .mx_SenderProfile {
+                .mx_DisambiguatedProfile {
                     flex: 1;
                 }
             }
diff --git a/res/css/views/rooms/_ReplyTile.scss b/res/css/views/rooms/_ReplyTile.scss
index c2f19eff2d..ca8f886737 100644
--- a/res/css/views/rooms/_ReplyTile.scss
+++ b/res/css/views/rooms/_ReplyTile.scss
@@ -104,7 +104,7 @@ limitations under the License.
         padding-top: 0;
     }
 
-    .mx_SenderProfile {
+    .mx_DisambiguatedProfile {
         font-size: $font-14px;
         line-height: $font-17px;