diff --git a/src/plugins/system/mokowaasbrand/services/provider.php b/src/plugins/system/mokowaasbrand/services/provider.php
index f2a9c834..481ab323 100644
--- a/src/plugins/system/mokowaasbrand/services/provider.php
+++ b/src/plugins/system/mokowaasbrand/services/provider.php
@@ -30,6 +30,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
+use Moko\Plugin\System\MokoWaaSBrand\Extension\MokoWaaSBrand;
 
 return new class () implements ServiceProviderInterface {
 	/**
@@ -46,7 +47,7 @@ return new class () implements ServiceProviderInterface {
 		$container->set(
 			PluginInterface::class,
 			function (Container $container) {
-				$plugin = new PlgSystemMokoWaaSBrand(
+				$plugin = new MokoWaaSBrand(
 					$container->get(DispatcherInterface::class),
 					(array) PluginHelper::getPlugin('system', 'mokowaasbrand')
 				);
diff --git a/src/plugins/system/mokowaasbrand/src/Extension/mokowaasbrand.php b/src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php
similarity index 91%
rename from src/plugins/system/mokowaasbrand/src/Extension/mokowaasbrand.php
rename to src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php
index 69b62652..f569cac4 100644
--- a/src/plugins/system/mokowaasbrand/src/Extension/mokowaasbrand.php
+++ b/src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php
@@ -17,11 +17,13 @@
  * INGROUP: MokoWaaS-Brand
  * REPO: https://github.com/mokoconsulting-tech/mokowaasbrand
  * VERSION: 01.04.00
- * PATH: /src/mokowaasbrand.php
- * BRIEF: Main plugin file for MokoWaaS-Brand system plugin
+ * PATH: /src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php
+ * BRIEF: Main plugin class for MokoWaaS-Brand system plugin
  * NOTE: Handles Joomla system events for rebranding functionality
  */
 
+namespace Moko\Plugin\System\MokoWaaSBrand\Extension;
+
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -34,7 +36,7 @@ use Joomla\CMS\Plugin\CMSPlugin;
  *
  * @since  01.04.00
  */
-class PlgSystemMokoWaaSBrand extends CMSPlugin
+class MokoWaaSBrand extends CMSPlugin
 {
 	/**
 	 * Load the language file on instantiation.