diff --git a/source/packages/plg_mokosuitecross_bluesky/bluesky.xml b/source/packages/plg_mokosuitecross_bluesky/bluesky.xml
index 41cc1ed6..a170a69f 100644
--- a/source/packages/plg_mokosuitecross_bluesky/bluesky.xml
+++ b/source/packages/plg_mokosuitecross_bluesky/bluesky.xml
@@ -10,7 +10,7 @@
     <license>GPL-3.0-or-later</license>
     <description>PLG_MOKOSUITECROSS_BLUESKY_DESCRIPTION</description>
 
-    <namespace path="src">Joomla\Plugin\MokoSuiteCross${CLASS_NAME}</namespace>
+    <namespace path="src">Joomla\Plugin\MokoSuiteCross\Bluesky</namespace>
 
     <files>
         <filename plugin="bluesky">bluesky.php</filename>
diff --git a/source/packages/plg_mokosuitecross_discord/discord.xml b/source/packages/plg_mokosuitecross_discord/discord.xml
index 8dd56f85..34770d03 100644
--- a/source/packages/plg_mokosuitecross_discord/discord.xml
+++ b/source/packages/plg_mokosuitecross_discord/discord.xml
@@ -10,7 +10,7 @@
     <license>GPL-3.0-or-later</license>
     <description>PLG_MOKOSUITECROSS_DISCORD_DESCRIPTION</description>
 
-    <namespace path="src">Joomla\Plugin\MokoSuiteCross${CLASS_NAME}</namespace>
+    <namespace path="src">Joomla\Plugin\MokoSuiteCross\Discord</namespace>
 
     <files>
         <filename plugin="discord">discord.php</filename>
diff --git a/source/packages/plg_mokosuitecross_facebook/facebook.xml b/source/packages/plg_mokosuitecross_facebook/facebook.xml
index 55fc9c96..120a0b7a 100644
--- a/source/packages/plg_mokosuitecross_facebook/facebook.xml
+++ b/source/packages/plg_mokosuitecross_facebook/facebook.xml
@@ -10,7 +10,7 @@
     <license>GPL-3.0-or-later</license>
     <description>PLG_MOKOSUITECROSS_FACEBOOK_DESCRIPTION</description>
 
-    <namespace path="src">Joomla\Plugin\MokoSuiteCross${CLASS_NAME}</namespace>
+    <namespace path="src">Joomla\Plugin\MokoSuiteCross\Facebook</namespace>
 
     <files>
         <filename plugin="facebook">facebook.php</filename>
diff --git a/source/packages/plg_mokosuitecross_linkedin/linkedin.xml b/source/packages/plg_mokosuitecross_linkedin/linkedin.xml
index ae6a9ec2..ec4b8a93 100644
--- a/source/packages/plg_mokosuitecross_linkedin/linkedin.xml
+++ b/source/packages/plg_mokosuitecross_linkedin/linkedin.xml
@@ -10,7 +10,7 @@
     <license>GPL-3.0-or-later</license>
     <description>PLG_MOKOSUITECROSS_LINKEDIN_DESCRIPTION</description>
 
-    <namespace path="src">Joomla\Plugin\MokoSuiteCross${CLASS_NAME}</namespace>
+    <namespace path="src">Joomla\Plugin\MokoSuiteCross\Linkedin</namespace>
 
     <files>
         <filename plugin="linkedin">linkedin.php</filename>
diff --git a/source/packages/plg_mokosuitecross_slack/slack.xml b/source/packages/plg_mokosuitecross_slack/slack.xml
index 9604b7ce..219ae945 100644
--- a/source/packages/plg_mokosuitecross_slack/slack.xml
+++ b/source/packages/plg_mokosuitecross_slack/slack.xml
@@ -10,7 +10,7 @@
     <license>GPL-3.0-or-later</license>
     <description>PLG_MOKOSUITECROSS_SLACK_DESCRIPTION</description>
 
-    <namespace path="src">Joomla\Plugin\MokoSuiteCross${CLASS_NAME}</namespace>
+    <namespace path="src">Joomla\Plugin\MokoSuiteCross\Slack</namespace>
 
     <files>
         <filename plugin="slack">slack.php</filename>
diff --git a/source/packages/plg_mokosuitecross_telegram/telegram.xml b/source/packages/plg_mokosuitecross_telegram/telegram.xml
index 8bce76be..f449bdd9 100644
--- a/source/packages/plg_mokosuitecross_telegram/telegram.xml
+++ b/source/packages/plg_mokosuitecross_telegram/telegram.xml
@@ -10,7 +10,7 @@
     <license>GPL-3.0-or-later</license>
     <description>PLG_MOKOSUITECROSS_TELEGRAM_DESCRIPTION</description>
 
-    <namespace path="src">Joomla\Plugin\MokoSuiteCross${CLASS_NAME}</namespace>
+    <namespace path="src">Joomla\Plugin\MokoSuiteCross\Telegram</namespace>
 
     <files>
         <filename plugin="telegram">telegram.php</filename>
diff --git a/source/packages/plg_mokosuitecross_twitter/twitter.xml b/source/packages/plg_mokosuitecross_twitter/twitter.xml
index 02d2ad99..74108b62 100644
--- a/source/packages/plg_mokosuitecross_twitter/twitter.xml
+++ b/source/packages/plg_mokosuitecross_twitter/twitter.xml
@@ -10,7 +10,7 @@
     <license>GPL-3.0-or-later</license>
     <description>PLG_MOKOSUITECROSS_TWITTER_DESCRIPTION</description>
 
-    <namespace path="src">Joomla\Plugin\MokoSuiteCross${CLASS_NAME}</namespace>
+    <namespace path="src">Joomla\Plugin\MokoSuiteCross\Twitter</namespace>
 
     <files>
         <filename plugin="twitter">twitter.php</filename>