diff --git a/MANIFEST.json b/MANIFEST.json
index c7e6fb2..320289c 100644
--- a/MANIFEST.json
+++ b/MANIFEST.json
@@ -545,22 +545,22 @@
     },
     {
       "description": "The ThreatMatch Alert types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",
-      "name": "ThreatMatch",
+      "name": "threatmatch-alert-types",
       "version": 1
     },
     {
       "description": "The ThreatMatch Incident types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",
-      "name": "ThreatMatch",
+      "name": "threatmatch-incident-types",
       "version": 1
     },
     {
       "description": "The ThreatMatch Malware types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",
-      "name": "ThreatMatch",
+      "name": "threatmatch-malware-types",
       "version": 1
     },
     {
       "description": "The ThreatMatch Sector types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",
-      "name": "ThreatMatch",
+      "name": "threatmatch-sectors",
       "version": 1
     },
     {
diff --git a/threatmatch-alert-types/machinetag.json b/threatmatch-alert-types/machinetag.json
index af96ce4..e999f8f 100644
--- a/threatmatch-alert-types/machinetag.json
+++ b/threatmatch-alert-types/machinetag.json
@@ -1,5 +1,5 @@
 {
-  "namespace": "ThreatMatch",
+  "namespace": "threatmatch-alert-types",
   "expanded": "Alert Types for Sharing into ThreatMatch and MISP.",
   "version": 1,
   "description": "The ThreatMatch Alert types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",
diff --git a/threatmatch-incident-types/machinetag.json b/threatmatch-incident-types/machinetag.json
index 0f47736..cc2d031 100644
--- a/threatmatch-incident-types/machinetag.json
+++ b/threatmatch-incident-types/machinetag.json
@@ -1,5 +1,5 @@
 {
-  "namespace": "ThreatMatch",
+  "namespace": "threatmatch-incident-types",
   "expanded": "Incident Types for Sharing into ThreatMatch and MISP",
   "version": 1,
   "description": "The ThreatMatch Incident types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",
diff --git a/threatmatch-malware-types/machinetag.json b/threatmatch-malware-types/machinetag.json
index acc80dd..001c78e 100644
--- a/threatmatch-malware-types/machinetag.json
+++ b/threatmatch-malware-types/machinetag.json
@@ -1,5 +1,5 @@
 {
-  "namespace": "ThreatMatch",
+  "namespace": "threatmatch-malware-types",
   "expanded": "Malware Types for Sharing into ThreatMatch and MISP",
   "version": 1,
   "description": "The ThreatMatch Malware types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",
diff --git a/threatmatch-sectors/machinetag.json b/threatmatch-sectors/machinetag.json
index 6aa690f..9081c91 100644
--- a/threatmatch-sectors/machinetag.json
+++ b/threatmatch-sectors/machinetag.json
@@ -1,5 +1,5 @@
 {
-  "namespace": "ThreatMatch",
+  "namespace": "threatmatch-sectors",
   "expanded": "Sector Types for Sharing into ThreatMatch and MISP",
   "version": 1,
   "description": "The ThreatMatch Sector types are applicable for any ThreatMatch instances and should be used for all CIISI and TIBER Projects.",