diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
index 6e193c2658377..ffffe5f75ce75 100644
--- a/administrator/language/en-GB/en-GB.com_modules.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -39,8 +39,8 @@ COM_MODULES_FIELD_CONTENT_DESC="Text"
 COM_MODULES_FIELD_CONTENT_LABEL="Text"
 COM_MODULES_FIELD_MODULE_DESC="Module type."
 COM_MODULES_FIELD_MODULE_LABEL="Module Type"
-COM_MODULES_FIELD_MODULECLASS_SFX_DESC="A suffix to be applied to the CSS class of the module. This allows for individual module styling."
-COM_MODULES_FIELD_MODULECLASS_SFX_LABEL="Module Class Suffix"
+COM_MODULES_FIELD_MODULECLASS_DESC="Additional CSS class to be applied to the module. This allows for individual module styling."
+COM_MODULES_FIELD_MODULECLASS_LABEL="Module Class"
 COM_MODULES_FIELD_NOTE_DESC="An optional note to display in the Module Manager."
 COM_MODULES_FIELD_NOTE_LABEL="Note"
 COM_MODULES_FIELD_POSITION_DESC="You may select a module position from the list of pre-defined positions or enter your own module position by typing the name in the field and pressing enter."
diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml
index 1d6aa953d1f05..802fb62bbf373 100644
--- a/administrator/modules/mod_custom/mod_custom.xml
+++ b/administrator/modules/mod_custom/mod_custom.xml
@@ -48,8 +48,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" rows="3"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" 
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC" 
 				/>
 
 				<field
diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml
index ac636d58cbc5d..8980f6a4dc621 100644
--- a/administrator/modules/mod_feed/mod_feed.xml
+++ b/administrator/modules/mod_feed/mod_feed.xml
@@ -121,8 +121,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
index 380e6ebdc660c..230f49d6a3218 100644
--- a/administrator/modules/mod_feed/tmpl/default.php
+++ b/administrator/modules/mod_feed/tmpl/default.php
@@ -53,7 +53,7 @@
 		$iUrl   = isset($feed->image) ? $feed->image : null;
 		$iTitle = isset($feed->imagetitle) ? $feed->imagetitle : null;
 		?>
-		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed<?php echo $moduleclass_sfx; ?>">
+		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed <?php echo $moduleclass_sfx; ?>">
 		<?php
 
 		// Feed description
@@ -77,7 +77,7 @@
 
 	<!-- Show items -->
 	<?php if (!empty($feed)) : ?>
-		<ul class="newsfeed<?php echo $params->get('moduleclass_sfx'); ?>">
+		<ul class="newsfeed <?php echo $params->get('moduleclass_sfx'); ?>">
 		<?php for ($i = 0; $i < $params->get('rssitems', 5); $i++) :
 
 			if (!$feed->offsetExists($i)) :
diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml
index 4bf6e277cbf69..52f1143c1075a 100644
--- a/administrator/modules/mod_latest/mod_latest.xml
+++ b/administrator/modules/mod_latest/mod_latest.xml
@@ -76,8 +76,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" 
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml
index 98098f7051941..b342cb28b9ef6 100644
--- a/administrator/modules/mod_logged/mod_logged.xml
+++ b/administrator/modules/mod_logged/mod_logged.xml
@@ -51,8 +51,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml
index a5db4eb30f7ca..aa1daed38cc02 100644
--- a/administrator/modules/mod_login/mod_login.xml
+++ b/administrator/modules/mod_login/mod_login.xml
@@ -45,8 +45,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 				 	rows="3"
 				/>
 			</fieldset>
diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml
index 43c6415ad44b8..39d495c0dc3cb 100644
--- a/administrator/modules/mod_menu/mod_menu.xml
+++ b/administrator/modules/mod_menu/mod_menu.xml
@@ -56,8 +56,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
index 20942743c3df8..897b0eb17d95f 100644
--- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
+++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
@@ -39,8 +39,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" rows="3"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 				/>
 
 			</fieldset>
diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml
index 09680e364951b..3f10e5b80321a 100644
--- a/administrator/modules/mod_popular/mod_popular.xml
+++ b/administrator/modules/mod_popular/mod_popular.xml
@@ -66,8 +66,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
index 096ac7ccbe0e2..e27b7a72b2fc8 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.xml
+++ b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -41,8 +41,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
index 0616c5bdac9e8..982906b1896ec 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
@@ -58,8 +58,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 				 	rows="3"
 				/>
 
diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php
index 7caa6b1f8ee4a..20e3a4c70041c 100644
--- a/administrator/modules/mod_stats_admin/tmpl/default.php
+++ b/administrator/modules/mod_stats_admin/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="list-group list-group-flush stats-module<?php echo $moduleclass_sfx ?>">
+<ul class="list-group list-group-flush stats-module <?php echo $moduleclass_sfx ?>">
 	<?php foreach ($list as $item) : ?>
 		<li class="list-group-item"><span class="mr-2 ml-2 icon-<?php echo $item->icon; ?>" title="<?php echo $item->title; ?>" aria-hidden="true"></span> <?php echo $item->title; ?> <?php echo $item->data; ?></li>
 	<?php endforeach; ?>
diff --git a/administrator/modules/mod_status/mod_status.xml b/administrator/modules/mod_status/mod_status.xml
index e949bbe575c17..5dcfcdb63e1e9 100644
--- a/administrator/modules/mod_status/mod_status.xml
+++ b/administrator/modules/mod_status/mod_status.xml
@@ -57,8 +57,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" rows="3"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" 
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC" 
 				/>
 			</fieldset>
 		</fields>
diff --git a/administrator/modules/mod_title/mod_title.xml b/administrator/modules/mod_title/mod_title.xml
index 8254b45e2a82d..8b5e35cc71a15 100644
--- a/administrator/modules/mod_title/mod_title.xml
+++ b/administrator/modules/mod_title/mod_title.xml
@@ -31,8 +31,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 			</fieldset>
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml
index d2709aaab466b..344b4a1537d77 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.xml
+++ b/administrator/modules/mod_toolbar/mod_toolbar.xml
@@ -31,8 +31,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 			</fieldset>
diff --git a/administrator/modules/mod_version/mod_version.xml b/administrator/modules/mod_version/mod_version.xml
index 2090b0e175363..d3b09a02ec455 100644
--- a/administrator/modules/mod_version/mod_version.xml
+++ b/administrator/modules/mod_version/mod_version.xml
@@ -57,8 +57,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 			</fieldset>
diff --git a/administrator/templates/system/html/modules.php b/administrator/templates/system/html/modules.php
index 51bb18259a0bb..c503d1486bc5f 100644
--- a/administrator/templates/system/html/modules.php
+++ b/administrator/templates/system/html/modules.php
@@ -31,7 +31,7 @@ function modChrome_html5($module, &$params, &$attribs)
 
 	if (!empty ($module->content))
 	{
-		$html  = "<{$moduleTag} class=\"moduletable{$moduleClassSfx} {$moduleClass}\">";
+		$html  = "<{$moduleTag} class=\"moduletable {$moduleClassSfx} {$moduleClass}\">";
 
 		if ((bool) $module->showtitle)
 		{
@@ -63,7 +63,7 @@ function modChrome_xhtml($module, &$params, &$attribs)
 	$content = trim($module->content);
 
 	if (!empty ($content)) : ?>
-		<<?php echo $moduleTag; ?> class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+		<<?php echo $moduleTag; ?> class="module <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
 			<?php if ($module->showtitle != 0) : ?>
 				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
 			<?php endif; ?>
diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml
index f8823fac336e5..79ee036d5d874 100644
--- a/modules/mod_articles_archive/mod_articles_archive.xml
+++ b/modules/mod_articles_archive/mod_articles_archive.xml
@@ -42,8 +42,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_articles_archive/tmpl/default.php b/modules/mod_articles_archive/tmpl/default.php
index a533e59366630..ed5e42cad260c 100644
--- a/modules/mod_articles_archive/tmpl/default.php
+++ b/modules/mod_articles_archive/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 ?>
 <?php if (!empty($list)) : ?>
-	<ul class="archive-module<?php echo $moduleclass_sfx; ?>">
+	<ul class="archive-module <?php echo $moduleclass_sfx; ?>">
 	<?php foreach ($list as $item) : ?>
 	<li>
 		<a href="<?php echo $item->link; ?>">
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index 0f97f074acfdc..fb96908b6dacb 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -138,8 +138,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_articles_categories/tmpl/default.php b/modules/mod_articles_categories/tmpl/default.php
index b5ce9907833df..b3808652936ee 100644
--- a/modules/mod_articles_categories/tmpl/default.php
+++ b/modules/mod_articles_categories/tmpl/default.php
@@ -9,6 +9,6 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="categories-module<?php echo $moduleclass_sfx; ?>">
+<ul class="categories-module <?php echo $moduleclass_sfx; ?>">
 <?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
 </ul>
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index 971116399313c..5656052c67109 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -503,8 +503,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_articles_category/tmpl/default.php b/modules/mod_articles_category/tmpl/default.php
index 27909e734de41..f5326cfa33136 100644
--- a/modules/mod_articles_category/tmpl/default.php
+++ b/modules/mod_articles_category/tmpl/default.php
@@ -10,10 +10,10 @@
 defined('_JEXEC') or die;
 
 ?>
-<ul class="category-module<?php echo $moduleclass_sfx; ?>">
+<ul class="category-module <?php echo $moduleclass_sfx; ?>">
 	<?php if ($grouped) : ?>
 		<?php foreach ($list as $group_name => $group) : ?>
-		<li>
+		<li> 
 			<div class="mod-articles-category-group"><?php echo $group_name; ?></div>
 			<ul>
 				<?php foreach ($group as $item) : ?>
diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index 26b84cd43791e..1cfc7594133d1 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -93,8 +93,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" rows="3"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 				/>
 
 				<field
diff --git a/modules/mod_articles_latest/tmpl/default.php b/modules/mod_articles_latest/tmpl/default.php
index ed834b96b1db2..4630c0ec00a47 100644
--- a/modules/mod_articles_latest/tmpl/default.php
+++ b/modules/mod_articles_latest/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="latestnews<?php echo $moduleclass_sfx; ?>">
+<ul class="latestnews <?php echo $moduleclass_sfx; ?>">
 <?php foreach ($list as $item) : ?>
 	<li itemscope itemtype="https://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index f607b508e748f..b597039cc139d 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -194,8 +194,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" rows="3"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 				/>
 
 				<field
diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php
index c5101cfddbe55..b86f746abbd22 100644
--- a/modules/mod_articles_news/tmpl/_item.php
+++ b/modules/mod_articles_news/tmpl/_item.php
@@ -13,7 +13,7 @@
 ?>
 <?php if ($params->get('item_title')) : ?>
 
-	<<?php echo $item_heading; ?> class="newsflash-title<?php echo $params->get('moduleclass_sfx'); ?>">
+	<<?php echo $item_heading; ?> class="newsflash-title <?php echo $params->get('moduleclass_sfx'); ?>">
 	<?php if ($item->link !== '' && $params->get('link_titles')) : ?>
 		<a href="<?php echo $item->link; ?>">
 			<?php echo $item->title; ?>
diff --git a/modules/mod_articles_news/tmpl/default.php b/modules/mod_articles_news/tmpl/default.php
index 5cb29b093b965..ecafff20c7492 100644
--- a/modules/mod_articles_news/tmpl/default.php
+++ b/modules/mod_articles_news/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<div class="newsflash<?php echo $moduleclass_sfx; ?>">
+<div class="newsflash <?php echo $moduleclass_sfx; ?>">
 	<?php foreach ($list as $item) : ?>
 		<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
 	<?php endforeach; ?>
diff --git a/modules/mod_articles_news/tmpl/horizontal.php b/modules/mod_articles_news/tmpl/horizontal.php
index 475f75b3e9c82..a40865830af7a 100644
--- a/modules/mod_articles_news/tmpl/horizontal.php
+++ b/modules/mod_articles_news/tmpl/horizontal.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="newsflash-horiz<?php echo $params->get('moduleclass_sfx'); ?>">
+<ul class="newsflash-horiz <?php echo $params->get('moduleclass_sfx'); ?>">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li>
diff --git a/modules/mod_articles_news/tmpl/vertical.php b/modules/mod_articles_news/tmpl/vertical.php
index 1ec2600a7bf88..16127954fa2c1 100644
--- a/modules/mod_articles_news/tmpl/vertical.php
+++ b/modules/mod_articles_news/tmpl/vertical.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="newsflash-vert<?php echo $params->get('moduleclass_sfx'); ?>">
+<ul class="newsflash-vert <?php echo $params->get('moduleclass_sfx'); ?>">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li class="newsflash-item">
diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml
index 9b2f25eace222..3d8b3a447e1cf 100644
--- a/modules/mod_articles_popular/mod_articles_popular.xml
+++ b/modules/mod_articles_popular/mod_articles_popular.xml
@@ -130,8 +130,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_articles_popular/tmpl/default.php b/modules/mod_articles_popular/tmpl/default.php
index 8ba8075b98346..238d76af17af7 100644
--- a/modules/mod_articles_popular/tmpl/default.php
+++ b/modules/mod_articles_popular/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="mostread<?php echo $moduleclass_sfx; ?>">
+<ul class="mostread <?php echo $moduleclass_sfx; ?>">
 <?php foreach ($list as $item) : ?>
 	<li itemscope itemtype="https://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml
index 938f47f56edd4..f06e9eb7e2cc7 100644
--- a/modules/mod_banners/mod_banners.xml
+++ b/modules/mod_banners/mod_banners.xml
@@ -122,8 +122,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" rows="3"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 				/>
 
 				<field
diff --git a/modules/mod_banners/tmpl/default.php b/modules/mod_banners/tmpl/default.php
index 9eacd019b1d39..5a84e815d5e4f 100644
--- a/modules/mod_banners/tmpl/default.php
+++ b/modules/mod_banners/tmpl/default.php
@@ -11,7 +11,7 @@
 
 use Joomla\Component\Banners\Site\Helper\BannerHelper;
 ?>
-<div class="bannergroup<?php echo $moduleclass_sfx; ?>">
+<div class="bannergroup <?php echo $moduleclass_sfx; ?>">
 <?php if ($headerText) : ?>
 	<?php echo $headerText; ?>
 <?php endif; ?>
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index a9268ecc9da14..e0dda40790353 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -12,7 +12,7 @@
 JHtml::_('bootstrap.tooltip');
 ?>
 
-<ul itemscope itemtype="https://schema.org/BreadcrumbList" class="breadcrumb<?php echo $moduleclass_sfx; ?>">
+<ul itemscope itemtype="https://schema.org/BreadcrumbList" class="breadcrumb <?php echo $moduleclass_sfx; ?>">
 	<?php if ($params->get('showHere', 1)) : ?>
 		<li class="float-left">
 			<?php echo JText::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index 7bc8d54e4e74b..1a2ddfd35607e 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -55,8 +55,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_custom/tmpl/default.php b/modules/mod_custom/tmpl/default.php
index 560cbec95a64c..83c78e58a02f7 100644
--- a/modules/mod_custom/tmpl/default.php
+++ b/modules/mod_custom/tmpl/default.php
@@ -11,6 +11,6 @@
 ?>
 
 
-<div class="custom<?php echo $moduleclass_sfx; ?>" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?> >
+<div class="custom <?php echo $moduleclass_sfx; ?>" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?> >
 	<?php echo $module->content; ?>
 </div>
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index 90305f14b803e..6423ff955b654 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -121,8 +121,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" 
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_feed/tmpl/default.php b/modules/mod_feed/tmpl/default.php
index 07c9791191c52..a4fb82e815647 100644
--- a/modules/mod_feed/tmpl/default.php
+++ b/modules/mod_feed/tmpl/default.php
@@ -58,7 +58,7 @@
 		$iUrl   = isset($feed->image) ? $feed->image : null;
 		$iTitle = isset($feed->imagetitle) ? $feed->imagetitle : null;
 		?>
-		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed<?php echo $moduleclass_sfx; ?>">
+		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed <?php echo $moduleclass_sfx; ?>">
 		<?php
 		// Feed description
 		if ($feed->title !== null && $params->get('rsstitle', 1))
diff --git a/modules/mod_finder/mod_finder.xml b/modules/mod_finder/mod_finder.xml
index 48b0fc37b401c..325575c48ae36 100644
--- a/modules/mod_finder/mod_finder.xml
+++ b/modules/mod_finder/mod_finder.xml
@@ -125,8 +125,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 					default=""
 				/>
diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml
index 215eb8bb93b4b..a8042a6d117c1 100644
--- a/modules/mod_footer/mod_footer.xml
+++ b/modules/mod_footer/mod_footer.xml
@@ -31,8 +31,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_footer/tmpl/default.php b/modules/mod_footer/tmpl/default.php
index 6b82ab06029e0..a58fa08d16f8c 100644
--- a/modules/mod_footer/tmpl/default.php
+++ b/modules/mod_footer/tmpl/default.php
@@ -9,5 +9,5 @@
 
 defined('_JEXEC') or die;
 ?>
-<div class="footer1<?php echo $moduleclass_sfx; ?>"><?php echo $lineone; ?></div>
-<div class="footer2<?php echo $moduleclass_sfx; ?>"><?php echo JText::_('MOD_FOOTER_LINE2'); ?></div>
+<div class="footer1 <?php echo $moduleclass_sfx; ?>"><?php echo $lineone; ?></div>
+<div class="footer2 <?php echo $moduleclass_sfx; ?>"><?php echo JText::_('MOD_FOOTER_LINE2'); ?></div>
diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml
index 935bc9ab77b51..3b21a7f4935a0 100644
--- a/modules/mod_languages/mod_languages.xml
+++ b/modules/mod_languages/mod_languages.xml
@@ -161,8 +161,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" rows="3"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 				/>
 
 				<field
diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php
index ae0cd63b341f5..ecc1bae43b36e 100644
--- a/modules/mod_languages/tmpl/default.php
+++ b/modules/mod_languages/tmpl/default.php
@@ -16,7 +16,7 @@
 	JHtml::_('formbehavior.chosen');
 }
 ?>
-<div class="mod-languages<?php echo $moduleclass_sfx; ?>">
+<div class="mod-languages <?php echo $moduleclass_sfx; ?>">
 <?php if ($headerText) : ?>
 	<div class="pretext"><p><?php echo $headerText; ?></p></div>
 <?php endif; ?>
diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index 4a899ce7b2550..270f5ee5d3fac 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -143,8 +143,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index 89e8e62929ae4..b661af5e20297 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -127,8 +127,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_random_image/mod_random_image.xml b/modules/mod_random_image/mod_random_image.xml
index 1c02546603b01..41115e675cd84 100644
--- a/modules/mod_random_image/mod_random_image.xml
+++ b/modules/mod_random_image/mod_random_image.xml
@@ -70,8 +70,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_random_image/tmpl/default.php b/modules/mod_random_image/tmpl/default.php
index d1caddec2f1b1..5cae940a212df 100644
--- a/modules/mod_random_image/tmpl/default.php
+++ b/modules/mod_random_image/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<div class="random-image<?php echo $moduleclass_sfx; ?>">
+<div class="random-image <?php echo $moduleclass_sfx; ?>">
 <?php if ($link) : ?>
 <a href="<?php echo $link; ?>">
 <?php endif; ?>
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index 94372bfc09b73..d16a96bce6ed0 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -53,8 +53,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" 
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_related_items/tmpl/default.php b/modules/mod_related_items/tmpl/default.php
index fdbc7ac573538..6f887e4853f3d 100644
--- a/modules/mod_related_items/tmpl/default.php
+++ b/modules/mod_related_items/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="relateditems<?php echo $moduleclass_sfx; ?>">
+<ul class="relateditems <?php echo $moduleclass_sfx; ?>">
 <?php foreach ($list as $item) : ?>
 <li>
 	<a href="<?php echo $item->route; ?>">
diff --git a/modules/mod_search/mod_search.xml b/modules/mod_search/mod_search.xml
index 60ab472f16780..7a94600c10d1a 100644
--- a/modules/mod_search/mod_search.xml
+++ b/modules/mod_search/mod_search.xml
@@ -110,8 +110,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_search/tmpl/default.php b/modules/mod_search/tmpl/default.php
index b3da33a00633f..989bcee79cb00 100644
--- a/modules/mod_search/tmpl/default.php
+++ b/modules/mod_search/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 ?>
-<div class="search<?php echo $moduleclass_sfx; ?>">
+<div class="search <?php echo $moduleclass_sfx; ?>">
 	<form action="<?php echo JRoute::_('index.php'); ?>" method="post">
 		<?php
 			$input  = '<input name="searchword" id="mod-search-searchword' . $module->id . '" class="form-control" type="search" placeholder="' . $text . '">';
diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml
index aec5de2be3b38..f4d91ccc93bf7 100644
--- a/modules/mod_stats/mod_stats.xml
+++ b/modules/mod_stats/mod_stats.xml
@@ -77,8 +77,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea" 
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_stats/tmpl/default.php b/modules/mod_stats/tmpl/default.php
index 73ece3cbd1160..4d72d0d043d31 100644
--- a/modules/mod_stats/tmpl/default.php
+++ b/modules/mod_stats/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="list-group<?php echo $moduleclass_sfx; ?>">
+<ul class="list-group <?php echo $moduleclass_sfx; ?>">
 <?php foreach ($list as $item) : ?>
 	<li class="list-group-item justify-content-between">
 		<?php echo $item->title; ?>
diff --git a/modules/mod_syndicate/mod_syndicate.xml b/modules/mod_syndicate/mod_syndicate.xml
index 445f60b149697..5520727a5dbc0 100644
--- a/modules/mod_syndicate/mod_syndicate.xml
+++ b/modules/mod_syndicate/mod_syndicate.xml
@@ -65,8 +65,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_syndicate/tmpl/default.php b/modules/mod_syndicate/tmpl/default.php
index fb7d97c922eab..25a5198934c92 100644
--- a/modules/mod_syndicate/tmpl/default.php
+++ b/modules/mod_syndicate/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 ?>
-<a href="<?php echo $link; ?>" class="syndicate-module<?php echo $moduleclass_sfx; ?>">
+<a href="<?php echo $link; ?>" class="syndicate-module <?php echo $moduleclass_sfx; ?>">
 	<?php echo JHtml::_('image', 'system/livemarks.png', 'feed-image', null, true); ?>
 	<?php if ($params->get('display_text', 1)) : ?>
 		<span>
diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml
index 0484b0392c66d..f38899f3be642 100644
--- a/modules/mod_tags_popular/mod_tags_popular.xml
+++ b/modules/mod_tags_popular/mod_tags_popular.xml
@@ -130,8 +130,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_tags_popular/tmpl/cloud.php b/modules/mod_tags_popular/tmpl/cloud.php
index 1a526ba528360..479fbba506e4f 100644
--- a/modules/mod_tags_popular/tmpl/cloud.php
+++ b/modules/mod_tags_popular/tmpl/cloud.php
@@ -14,7 +14,7 @@
 
 JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php');
 ?>
-<div class="tagspopular<?php echo $moduleclass_sfx; ?> tagscloud<?php echo $moduleclass_sfx; ?>">
+<div class="tagspopular tagscloud <?php echo $moduleclass_sfx; ?>">
 <?php
 if (!count($list)) : ?>
 	<div class="alert alert-no-items"><?php echo JText::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?></div>
diff --git a/modules/mod_tags_popular/tmpl/default.php b/modules/mod_tags_popular/tmpl/default.php
index 6c5ee2bae1472..0dd0ecbc4a139 100644
--- a/modules/mod_tags_popular/tmpl/default.php
+++ b/modules/mod_tags_popular/tmpl/default.php
@@ -11,7 +11,7 @@
 
 ?>
 <?php JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php'); ?>
-<div class="tagspopular<?php echo $moduleclass_sfx; ?>">
+<div class="tagspopular <?php echo $moduleclass_sfx; ?>">
 <?php if (!count($list)) : ?>
 	<div class="alert alert-no-items"><?php echo JText::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?></div>
 <?php else : ?>
diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml
index b4ab8e2531802..54f537251e47f 100644
--- a/modules/mod_tags_similar/mod_tags_similar.xml
+++ b/modules/mod_tags_similar/mod_tags_similar.xml
@@ -68,8 +68,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_tags_similar/tmpl/default.php b/modules/mod_tags_similar/tmpl/default.php
index d7e1fc6a0b8dc..51d18bb25583f 100644
--- a/modules/mod_tags_similar/tmpl/default.php
+++ b/modules/mod_tags_similar/tmpl/default.php
@@ -11,7 +11,7 @@
 
 ?>
 <?php JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php'); ?>
-<div class="tagssimilar<?php echo $moduleclass_sfx; ?>">
+<div class="tagssimilar <?php echo $moduleclass_sfx; ?>">
 <?php if ($list) : ?>
 	<ul>
 	<?php foreach ($list as $i => $item) : ?>
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index 559bdb877d870..622aa4e8da584 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -53,8 +53,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_users_latest/tmpl/default.php b/modules/mod_users_latest/tmpl/default.php
index 32be1bd0f10c3..1224e6f55d33d 100644
--- a/modules/mod_users_latest/tmpl/default.php
+++ b/modules/mod_users_latest/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 ?>
 <?php if (!empty($names)) : ?>
-	<ul class="latestusers<?php echo $moduleclass_sfx; ?>" >
+	<ul class="latestusers <?php echo $moduleclass_sfx; ?>" >
 	<?php foreach ($names as $name) : ?>
 		<li>
 			<?php echo $name->username; ?>
diff --git a/modules/mod_whosonline/mod_whosonline.xml b/modules/mod_whosonline/mod_whosonline.xml
index e69dfb8a672cd..11d7267e2cc58 100644
--- a/modules/mod_whosonline/mod_whosonline.xml
+++ b/modules/mod_whosonline/mod_whosonline.xml
@@ -57,8 +57,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_whosonline/tmpl/default.php b/modules/mod_whosonline/tmpl/default.php
index a94ba983ca0f0..aa99daf650c2d 100644
--- a/modules/mod_whosonline/tmpl/default.php
+++ b/modules/mod_whosonline/tmpl/default.php
@@ -20,7 +20,7 @@
 	<?php if ($params->get('filter_groups')) : ?>
 		<p><?php echo JText::_('MOD_WHOSONLINE_SAME_GROUP_MESSAGE'); ?></p>
 	<?php endif; ?>
-	<ul class="nav flex-column<?php echo $moduleclass_sfx; ?>">
+	<ul class="nav flex-column <?php echo $moduleclass_sfx; ?>">
 	<?php foreach ($names as $name) : ?>
 		<li>
 			<?php echo $name->username; ?>
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index 9343fe08e6898..2fa673de855d3 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -116,8 +116,8 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC"
 					rows="3"
 				/>
 
diff --git a/modules/mod_wrapper/tmpl/default.php b/modules/mod_wrapper/tmpl/default.php
index 3aee47abd6e14..81133d88e1cd5 100644
--- a/modules/mod_wrapper/tmpl/default.php
+++ b/modules/mod_wrapper/tmpl/default.php
@@ -19,6 +19,6 @@
 	height="<?php echo $height; ?>"
 	scrolling="<?php echo $scroll; ?>"
 	frameborder="<?php echo $frameborder; ?>"
-	class="wrapper<?php echo $moduleclass_sfx; ?>" >
+	class="wrapper <?php echo $moduleclass_sfx; ?>" >
 	<?php echo JText::_('MOD_WRAPPER_NO_IFRAMES'); ?>
 </iframe>
diff --git a/templates/aurora/html/modules.php b/templates/aurora/html/modules.php
index 34c23888a1ec2..4e3b685d6a0c1 100644
--- a/templates/aurora/html/modules.php
+++ b/templates/aurora/html/modules.php
@@ -44,7 +44,7 @@ function modChrome_default($module, &$params, &$attribs)
 	if ($module->content)
 	{
 		echo '<' . $moduleTag . ' class="' . $modulePos . '">';
-		echo '<div class="card' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
+		echo '<div class="card ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
 		if ($module->showtitle && $headerClass !== 'card-title')
 		{
 			echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
@@ -71,7 +71,7 @@ function modChrome_cardGrey($module, &$params, &$attribs)
 	if ($module->content)
 	{
 		echo '<' . $moduleTag . ' class="' . $modulePos . '">';
-		echo '<div class="card card-grey' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
+		echo '<div class="card card-grey ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
 		if ($module->showtitle && $headerClass !== 'card-title')
 		{
 			echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
diff --git a/templates/system/html/modules.php b/templates/system/html/modules.php
index be6793a1d353e..aab9bb4a07f80 100644
--- a/templates/system/html/modules.php
+++ b/templates/system/html/modules.php
@@ -32,7 +32,7 @@ function modChrome_html5($module, &$params, &$attribs)
 	$headerClass    = !empty($headerClass) ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
 
 	if (!empty ($module->content)) : ?>
-		<<?php echo $moduleTag; ?> class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+		<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
 
 		<?php if ((bool) $module->showtitle) :?>
 			<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
@@ -50,7 +50,7 @@ function modChrome_html5($module, &$params, &$attribs)
  */
 function modChrome_table($module, &$params, &$attribs)
 { ?>
-	<table cellpadding="0" cellspacing="0" class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
+	<table cellpadding="0" cellspacing="0" class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
 	<?php if ((bool) $module->showtitle) : ?>
 		<tr>
 			<th>
@@ -98,7 +98,7 @@ function modChrome_xhtml($module, &$params, &$attribs)
 	$headerClass    = $headerClass ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
 
 	if (!empty ($module->content)) : ?>
-		<<?php echo $moduleTag; ?> class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+		<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
 			<?php if ((bool) $module->showtitle) : ?>
 				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
 			<?php endif; ?>
@@ -112,7 +112,7 @@ function modChrome_xhtml($module, &$params, &$attribs)
  */
 function modChrome_rounded($module, &$params, &$attribs)
 { ?>
-		<div class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
+		<div class="module <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
 			<div>
 				<div>
 					<div>
diff --git a/tests/unit/suites/libraries/cms/installer/data/mod_finder.xml b/tests/unit/suites/libraries/cms/installer/data/mod_finder.xml
index 3c8444e08c792..855e40a0fc512 100644
--- a/tests/unit/suites/libraries/cms/installer/data/mod_finder.xml
+++ b/tests/unit/suites/libraries/cms/installer/data/mod_finder.xml
@@ -65,8 +65,8 @@
 					name="moduleclass_sfx"
 					type="text"
 					default=""
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
+					label="COM_MODULES_FIELD_MODULECLASS_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_DESC" />
 				<field
 					name="field_size"
 					type="text"