diff --git a/resources/css/ext.uls.displaysettings.less b/resources/css/ext.uls.displaysettings.less
index 368553c9..20f08110 100644
--- a/resources/css/ext.uls.displaysettings.less
+++ b/resources/css/ext.uls.displaysettings.less
@@ -12,7 +12,7 @@
 	z-index: 1;
 }
 
-.ext-uls-sub-panel {
+.uls-sub-panel {
 	border-top: 1px solid #eaecf0;
 	padding-top: 25px;
 	top: -20px;
diff --git a/resources/css/ext.uls.inputsettings.less b/resources/css/ext.uls.inputsettings.less
index 9b58f143..a034d902 100644
--- a/resources/css/ext.uls.inputsettings.less
+++ b/resources/css/ext.uls.inputsettings.less
@@ -50,7 +50,7 @@
 	color: #000;
 }
 
-.ext-uls-input-settings-imes-title:empty {
+.uls-input-settings-imes-title:empty {
 	display: none;
 }
 
diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index aae888dc..d8407986 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -34,7 +34,7 @@
 		'</div>' +
 
 		// Begin display language sub-panel
-		'<div class="ext-uls-sub-panel uls-display-settings-language-tab">' +
+		'<div class="uls-sub-panel uls-display-settings-language-tab">' +
 
 		// "Display language", title above the buttons row
 		'<div class="row">' +
@@ -54,7 +54,7 @@
 		'</div>' +
 
 		// Begin font settings section, hidden by default
-		'<div class="ext-uls-sub-panel uls-display-settings-fonts-tab hide">' +
+		'<div class="uls-sub-panel uls-display-settings-fonts-tab hide">' +
 
 		// "Font settings" title
 		'<div class="row">' +
@@ -593,7 +593,7 @@
 					return;
 				}
 
-				displaySettings.$template.find( '.ext-uls-sub-panel' ).each( function () {
+				displaySettings.$template.find( '.uls-sub-panel' ).each( function () {
 					var $subPanel = $( this );
 
 					// eslint-disable-next-line no-jquery/no-class-state
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index 09a3e67e..fe16caeb 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -45,7 +45,7 @@
 		'<div class="twelve columns">' +
 		'<div class="uls-input-settings-inputmethods-list">' +
 		// "Input settings for language xyz" title
-		'<h4 class="ext-uls-input-settings-imes-title"></h4>' +
+		'<h4 class="uls-input-settings-imes-title"></h4>' +
 		'</div>' +
 		'</div>' +
 		'</div>' +
@@ -118,7 +118,7 @@
 
 			imes = $.ime.languages[ language ];
 
-			$imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' );
+			$imeListTitle = this.$template.find( '.uls-input-settings-imes-title' );
 			$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
 
 			$imeListContainer.empty();