diff --git a/src/437af6b0-ca02-49d7-8739-4edfc8a9ccb0/settings.json b/src/437af6b0-ca02-49d7-8739-4edfc8a9ccb0/settings.json
index bcbeaf7..a69fd4f 100644
--- a/src/437af6b0-ca02-49d7-8739-4edfc8a9ccb0/settings.json
+++ b/src/437af6b0-ca02-49d7-8739-4edfc8a9ccb0/settings.json
@@ -13,7 +13,7 @@
     "type": "class",
     "use_selection": null,
     "extendsinterfaces": null,
-    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Crypt.Aes.Legacy",
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\[[[ComponentNamespace]]].Crypt.Aes.Legacy",
     "description": "Legacy Class for Aes Encryption\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a25c82c8-14c2-40df-adae-f832709ab49b/settings.json b/src/a25c82c8-14c2-40df-adae-f832709ab49b/settings.json
index 3cecd41..f306730 100644
--- a/src/a25c82c8-14c2-40df-adae-f832709ab49b/settings.json
+++ b/src/a25c82c8-14c2-40df-adae-f832709ab49b/settings.json
@@ -18,7 +18,7 @@
         }
     },
     "extendsinterfaces": null,
-    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Crypt.Aes",
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\[[[ComponentNamespace]]].Crypt.Aes",
     "description": "Class for Aes Encryption\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e98b4edc-25b9-49d7-98a0-e42ad3b75efe/settings.json b/src/e98b4edc-25b9-49d7-98a0-e42ad3b75efe/settings.json
index 011a5a7..1c78780 100644
--- a/src/e98b4edc-25b9-49d7-98a0-e42ad3b75efe/settings.json
+++ b/src/e98b4edc-25b9-49d7-98a0-e42ad3b75efe/settings.json
@@ -18,7 +18,7 @@
         }
     },
     "extendsinterfaces": null,
-    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Crypt.FOF",
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\[[[ComponentNamespace]]].Crypt.FOF",
     "description": "Temp Class for FOFEncryptAes\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/fea2b107-3ee4-4ebf-84be-d3f2829c8614/settings.json b/src/fea2b107-3ee4-4ebf-84be-d3f2829c8614/settings.json
index 8e0c68e..28af83e 100644
--- a/src/fea2b107-3ee4-4ebf-84be-d3f2829c8614/settings.json
+++ b/src/fea2b107-3ee4-4ebf-84be-d3f2829c8614/settings.json
@@ -16,7 +16,7 @@
         }
     },
     "extendsinterfaces": null,
-    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Crypt.Password",
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\[[[ComponentNamespace]]].Crypt.Password",
     "description": "Password Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Language\\Text;",