diff --git a/CERT-XLM/machinetag.json b/CERT-XLM/machinetag.json
index 206a212..4c74989 100755
--- a/CERT-XLM/machinetag.json
+++ b/CERT-XLM/machinetag.json
@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 2,
   "namespace": "CERT-XLM",
   "description": "CERT-XLM Security Incident Classification.",
   "values": [
@@ -104,7 +104,7 @@
       ]
     },
     {
-      "predicate": "intrusions",
+      "predicate": "intrusion",
       "entry": [
         {
           "value": "privileged-account-compromise",
@@ -286,8 +286,8 @@
       "description": "Vulnerable"
     },
     {
-      "value": "comformity",
-      "expanded": "Comformity",
+      "value": "conformity",
+      "expanded": "Conformity",
       "description": "This group is for catching breach about controls given by the company or externals entities."
     },
     {
diff --git a/pentest/machinetag.json b/pentest/machinetag.json
index ecf4d2f..702ce6f 100644
--- a/pentest/machinetag.json
+++ b/pentest/machinetag.json
@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 2,
   "namespace": "pentest",
   "description": "pentest classification.",
   "values": [
@@ -220,7 +220,7 @@
       "description": "Automated tool that perform network checks"
     },
     {
-      "value": "exploit ",
+      "value": "exploit",
       "expanded": "Exploit",
       "description": "Exploitation of a vulnerability"
     },