diff --git a/galaxies/atrm.json b/galaxies/atrm.json
index d56184e..9b88d03 100644
--- a/galaxies/atrm.json
+++ b/galaxies/atrm.json
@@ -13,8 +13,8 @@
     ]
   },
   "name": "Azure Threat Research Matrix",
-  "namespace": "atrm",
+  "namespace": "microsoft",
   "type": "atrm",
   "uuid": "b541a056-154c-41e7-8a56-41db3f871c00",
-  "version": 2
+  "version": 3
 }
diff --git a/tools/gen_ms_atrm.py b/tools/gen_ms_atrm.py
index eb2298a..6ffe2ab 100755
--- a/tools/gen_ms_atrm.py
+++ b/tools/gen_ms_atrm.py
@@ -84,7 +84,7 @@ json_galaxy = {
     },
     'name': "Azure Threat Research Matrix",
     'description': "The purpose of the Azure Threat Research Matrix (ATRM) is to educate readers on the potential of Azure-based tactics, techniques, and procedures (TTPs). It is not to teach how to weaponize or specifically abuse them. For this reason, some specific commands will be obfuscated or parts will be omitted to prevent abuse.",
-    'namespace': "atrm",
+    'namespace': "microsoft",
     'type': "atrm",
     'uuid': "b541a056-154c-41e7-8a56-41db3f871c00",
     'version': 1
diff --git a/tools/gen_ms_tmss.py b/tools/gen_ms_tmss.py
index 63e0e79..f6cee38 100755
--- a/tools/gen_ms_tmss.py
+++ b/tools/gen_ms_tmss.py
@@ -114,7 +114,7 @@ json_galaxy = {
     },
     'name': galaxy_name,
     'description': galaxy_description,
-    'namespace': "tmss",
+    'namespace': "microsoft",
     'type': galaxy_type,
     'uuid': "d6532b58-99e0-44a9-93c8-affe055e4443",
     'version': 1