diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
index 831041ec38ca4..5f26c11ab18fc 100644
--- a/administrator/language/en-GB/en-GB.com_modules.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -35,7 +35,7 @@ COM_MODULES_FIELD_CACHING_LABEL="Caching"
 COM_MODULES_FIELD_CLIENT_ID_LABEL="Module Location"
 COM_MODULES_FIELD_CONTENT_LABEL="Text"
 COM_MODULES_FIELD_MODULE_LABEL="Module Type"
-COM_MODULES_FIELD_MODULECLASS_SFX_LABEL="Module Class"
+COM_MODULES_FIELD_MODULECLASS_SFX_LABEL="Module Class Suffix"
 COM_MODULES_FIELD_NOTE_LABEL="Note"
 COM_MODULES_FIELD_POSITION_LABEL="Position"
 COM_MODULES_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php
index 6f6caf9312beb..7b81d9f9c7bed 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 fa-fw fa fa-<?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/components/com_wrapper/tmpl/wrapper/default.php b/components/com_wrapper/tmpl/wrapper/default.php
index 8162af63d7fd8..78af0457059d3 100644
--- a/components/com_wrapper/tmpl/wrapper/default.php
+++ b/components/com_wrapper/tmpl/wrapper/default.php
@@ -39,7 +39,7 @@
 		<?php else : ?>
 			title="<?php echo $this->escape($this->params->get('page_title')); ?>"
 		<?php endif; ?>
-		class="com-wrapper__iframe wrapper <?php echo $this->pageclass_sfx; ?>">
+		class="com-wrapper__iframe wrapper<?php echo $this->pageclass_sfx; ?>">
 		<?php echo JText::_('COM_WRAPPER_NO_IFRAMES'); ?>
 	</iframe>
 </div>
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index 3b9251465c797..5864b2bbcfde2 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -83,7 +83,7 @@
 	. ($layout ? ' layout-' . $layout : ' no-layout')
 	. ($task ? ' task-' . $task : ' no-task')
 	. ($itemid ? ' itemid-' . $itemid : '')
-	. ' ' . $pageclass;
+	. $pageclass;
 	echo ($this->direction == 'rtl' ? ' rtl' : '');
 ?>">
 	<header class="header full-width">
diff --git a/templates/cassiopeia/html/modules.php b/templates/cassiopeia/html/modules.php
index 6c86d3c391cf1..c016207020ff7 100644
--- a/templates/cassiopeia/html/modules.php
+++ b/templates/cassiopeia/html/modules.php
@@ -43,7 +43,7 @@ function modChrome_default($module, &$params, &$attribs)
 
 	if ($module->content)
 	{
-		echo '<' . $moduleTag . ' class="' . $modulePos . ' card ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
+		echo '<' . $moduleTag . ' class="' . $modulePos . ' card' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
 		if ($module->showtitle && $headerClass !== 'card-title')
 		{
 			echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
@@ -68,7 +68,7 @@ function modChrome_cardGrey($module, &$params, &$attribs)
 
 	if ($module->content)
 	{
-		echo '<' . $moduleTag . ' class="' . $modulePos . ' card card-grey ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
+		echo '<' . $moduleTag . ' class="' . $modulePos . ' 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/cassiopeia/index.php b/templates/cassiopeia/index.php
index 220b079fc9149..604bea3c4fa0f 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -72,7 +72,7 @@
 	. ($layout ? ' layout-' . $layout : ' no-layout')
 	. ($task ? ' task-' . $task : ' no-task')
 	. ($itemid ? ' itemid-' . $itemid : '')
-	. ' ' . $pageclass;
+	. $pageclass;
 	echo ($this->direction == 'rtl' ? ' rtl' : '');
 ?>">
 	<div class="grid-child container-header full-width">
diff --git a/templates/system/html/modules.php b/templates/system/html/modules.php
index 3df167767b0f7..0102b2a2ef013 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>
@@ -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>