diff --git a/res/css/views/elements/_DesktopCapturerSourcePicker.scss b/res/css/views/elements/_DesktopCapturerSourcePicker.scss
index 4cb984e83c..f4ceedbd11 100644
--- a/res/css/views/elements/_DesktopCapturerSourcePicker.scss
+++ b/res/css/views/elements/_DesktopCapturerSourcePicker.scss
@@ -15,17 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_streamSelectorDialog {
+.mx_desktopCapturerSourcePicker {
     overflow: hidden;
 }
 
-.mx_streamSelectorDialog_tabLabels {
+.mx_desktopCapturerSourcePicker_tabLabels {
     display: flex;
     padding: 0 0 8px 0;
 }
 
-.mx_streamSelectorDialog_tabLabel,
-.mx_streamSelectorDialog_tabLabel_selected {
+.mx_desktopCapturerSourcePicker_tabLabel,
+.mx_desktopCapturerSourcePicker_tabLabel_selected {
     width: 100%;
     text-align: center;
     border-radius: 8px;
@@ -33,12 +33,12 @@ limitations under the License.
     font-size: $font-13px;
 }
 
-.mx_streamSelectorDialog_tabLabel_selected {
+.mx_desktopCapturerSourcePicker_tabLabel_selected {
     background-color: $tab-label-active-bg-color;
     color: $tab-label-active-fg-color;
 }
 
-.mx_streamSelectorDialog_panel {
+.mx_desktopCapturerSourcePicker_panel {
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
@@ -47,24 +47,24 @@ limitations under the License.
     overflow: overlay;
 }
 
-.mx_streamSelectorDialog_stream_button {
+.mx_desktopCapturerSourcePicker_stream_button {
     display: flex;
     flex-direction: column;
     margin: 8px;
     border-radius: 4px;
 }
 
-.mx_streamSelectorDialog_stream_button:hover,
-.mx_streamSelectorDialog_stream_button:focus {
+.mx_desktopCapturerSourcePicker_stream_button:hover,
+.mx_desktopCapturerSourcePicker_stream_button:focus {
     background: $roomtile-selected-bg-color;
 }
 
-.mx_streamSelectorDialog_stream_thumbnail {
+.mx_desktopCapturerSourcePicker_stream_thumbnail {
     margin: 4px;
     width: 312px;
 }
 
-.mx_streamSelectorDialog_stream_name {
+.mx_desktopCapturerSourcePicker_stream_name {
     margin: 0 4px;
     white-space: nowrap;
     text-overflow: ellipsis;
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
index 46155f1cbc..e1586c881f 100644
--- a/src/components/views/elements/DesktopCapturerSourcePicker.tsx
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -42,15 +42,15 @@ export class ExistingSource extends React.Component<DesktopCapturerSourceIProps>
     render() {
         return (
             <AccessibleButton
-                className="mx_streamSelectorDialog_stream_button"
+                className="mx_desktopCapturerSourcePicker_stream_button"
                 data-id={this.props.source.id}
                 title={this.props.source.name}
                 onClick={this.onClick} >
                 <img
-                    className="mx_streamSelectorDialog_stream_thumbnail"
+                    className="mx_desktopCapturerSourcePicker_stream_thumbnail"
                     src={this.props.source.thumbnail.toDataURL()}
                 />
-                <span className="mx_streamSelectorDialog_stream_name">{this.props.source.name}</span>
+                <span className="mx_desktopCapturerSourcePicker_stream_name">{this.props.source.name}</span>
             </AccessibleButton>
         );
     }
@@ -113,17 +113,17 @@ export default class DesktopCapturerSourcePicker extends React.Component<
                     return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
                 });
         }
-        const buttonStyle = "mx_streamSelectorDialog_tabLabel";
+        const buttonStyle = "mx_desktopCapturerSourcePicker_tabLabel";
         const screensButtonStyle = buttonStyle + ((this.state.selectedTab === Tabs.Screens) ? "_selected" : "");
         const windowsButtonStyle = buttonStyle + ((this.state.selectedTab === Tabs.Windows) ? "_selected" : "");
 
         return (
             <BaseDialog
-                className="mx_streamSelectorDialog"
+                className="mx_desktopCapturerSourcePicker"
                 onFinished={this.onCloseClick}
                 title={_td("Share your screen")}
             >
-                <div className="mx_streamSelectorDialog_tabLabels">
+                <div className="mx_desktopCapturerSourcePicker_tabLabels">
                     <AccessibleButton
                         className={screensButtonStyle}
                         onClick={this.onScreensClick}
@@ -137,7 +137,7 @@ export default class DesktopCapturerSourcePicker extends React.Component<
                         {_td("Windows")}
                     </AccessibleButton>
                 </div>
-                <div className="mx_streamSelectorDialog_panel">
+                <div className="mx_desktopCapturerSourcePicker_panel">
                     { sources }
                 </div>
             </BaseDialog>