diff --git a/analyzer/ras-data/data/ras-data-p10-10.json b/analyzer/ras-data/data/ras-data-p10-10.json
index 6b42dd9..c544503 100644
--- a/analyzer/ras-data/data/ras-data-p10-10.json
+++ b/analyzer/ras-data/data/ras-data-p10-10.json
@@ -11650,22 +11650,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "06b7": {
@@ -11854,22 +11854,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "0985": {
@@ -12144,22 +12144,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "0bb7": {
@@ -12348,22 +12348,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "0cb8": {
diff --git a/analyzer/ras-data/data/ras-data-p10-20.json b/analyzer/ras-data/data/ras-data-p10-20.json
index 425ceb4..2296c59 100644
--- a/analyzer/ras-data/data/ras-data-p10-20.json
+++ b/analyzer/ras-data/data/ras-data-p10-20.json
@@ -11650,22 +11650,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "06b7": {
@@ -11854,22 +11854,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "0985": {
@@ -12144,22 +12144,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "0bb7": {
@@ -12348,22 +12348,22 @@
                 "00": "level2_M_th_1"
             },
             "10": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "level2_M_th_1"
+                "00": "self_M_th_1"
             }
         },
         "0cb8": {