diff --git a/analyzer/ras-data/data/ras-data-p10-10.json b/analyzer/ras-data/data/ras-data-p10-10.json
index 74fce9d..4b652d8 100644
--- a/analyzer/ras-data/data/ras-data-p10-10.json
+++ b/analyzer/ras-data/data/ras-data-p10-10.json
@@ -23925,38 +23925,38 @@
                 "1f": "level2_M_th_1"
             },
             "3f": {
-                "00": "core0_M_th_1",
-                "01": "core1_M_th_1",
-                "02": "core2_M_th_1",
-                "03": "core3_M_th_1",
-                "04": "core4_M_th_1",
-                "05": "core5_M_th_1",
-                "06": "core6_M_th_1",
-                "07": "core7_M_th_1",
-                "08": "core8_M_th_1",
-                "09": "core9_M_th_1",
-                "0a": "core10_M_th_1",
-                "0b": "core11_M_th_1",
-                "0c": "core12_M_th_1",
-                "0d": "core13_M_th_1",
-                "0e": "core14_M_th_1",
-                "0f": "core15_M_th_1",
-                "10": "core16_M_th_1",
-                "11": "core17_M_th_1",
-                "12": "core18_M_th_1",
-                "13": "core19_M_th_1",
-                "14": "core20_M_th_1",
-                "15": "core21_M_th_1",
-                "16": "core22_M_th_1",
-                "17": "core23_M_th_1",
-                "18": "core24_M_th_1",
-                "19": "core25_M_th_1",
-                "1a": "core26_M_th_1",
-                "1b": "core27_M_th_1",
-                "1c": "core28_M_th_1",
-                "1d": "core29_M_th_1",
-                "1e": "core30_M_th_1",
-                "1f": "core31_M_th_1"
+                "00": "level2_M_th_1",
+                "01": "level2_M_th_1",
+                "02": "level2_M_th_1",
+                "03": "level2_M_th_1",
+                "04": "level2_M_th_1",
+                "05": "level2_M_th_1",
+                "06": "level2_M_th_1",
+                "07": "level2_M_th_1",
+                "08": "level2_M_th_1",
+                "09": "level2_M_th_1",
+                "0a": "level2_M_th_1",
+                "0b": "level2_M_th_1",
+                "0c": "level2_M_th_1",
+                "0d": "level2_M_th_1",
+                "0e": "level2_M_th_1",
+                "0f": "level2_M_th_1",
+                "10": "level2_M_th_1",
+                "11": "level2_M_th_1",
+                "12": "level2_M_th_1",
+                "13": "level2_M_th_1",
+                "14": "level2_M_th_1",
+                "15": "level2_M_th_1",
+                "16": "level2_M_th_1",
+                "17": "level2_M_th_1",
+                "18": "level2_M_th_1",
+                "19": "level2_M_th_1",
+                "1a": "level2_M_th_1",
+                "1b": "level2_M_th_1",
+                "1c": "level2_M_th_1",
+                "1d": "level2_M_th_1",
+                "1e": "level2_M_th_1",
+                "1f": "level2_M_th_1"
             }
         },
         "7a0e": {
@@ -25831,13 +25831,12 @@
                 "07": "level2_M_th_1"
             },
             "0f": {
-                "00": "pau0_M_th_1",
-                "03": "pau3_M_th_1",
-                "04": "pau4_M_th_1",
-                "05": "pau5_M_th_1",
-                "06": "pau6_M_th_1",
-                "07": "pau7_M_th_1",
-                "flags": ["cs_possible"]
+                "00": "level2_M_th_1",
+                "03": "level2_M_th_1",
+                "04": "level2_M_th_1",
+                "05": "level2_M_th_1",
+                "06": "level2_M_th_1",
+                "07": "level2_M_th_1"
             },
             "10": {
                 "00": "level2_M_th_1",
diff --git a/analyzer/ras-data/data/ras-data-p10-20.json b/analyzer/ras-data/data/ras-data-p10-20.json
index d426d60..f95b0cb 100644
--- a/analyzer/ras-data/data/ras-data-p10-20.json
+++ b/analyzer/ras-data/data/ras-data-p10-20.json
@@ -23926,38 +23926,38 @@
                 "1f": "level2_M_th_1"
             },
             "3f": {
-                "00": "core0_M_th_1",
-                "01": "core1_M_th_1",
-                "02": "core2_M_th_1",
-                "03": "core3_M_th_1",
-                "04": "core4_M_th_1",
-                "05": "core5_M_th_1",
-                "06": "core6_M_th_1",
-                "07": "core7_M_th_1",
-                "08": "core8_M_th_1",
-                "09": "core9_M_th_1",
-                "0a": "core10_M_th_1",
-                "0b": "core11_M_th_1",
-                "0c": "core12_M_th_1",
-                "0d": "core13_M_th_1",
-                "0e": "core14_M_th_1",
-                "0f": "core15_M_th_1",
-                "10": "core16_M_th_1",
-                "11": "core17_M_th_1",
-                "12": "core18_M_th_1",
-                "13": "core19_M_th_1",
-                "14": "core20_M_th_1",
-                "15": "core21_M_th_1",
-                "16": "core22_M_th_1",
-                "17": "core23_M_th_1",
-                "18": "core24_M_th_1",
-                "19": "core25_M_th_1",
-                "1a": "core26_M_th_1",
-                "1b": "core27_M_th_1",
-                "1c": "core28_M_th_1",
-                "1d": "core29_M_th_1",
-                "1e": "core30_M_th_1",
-                "1f": "core31_M_th_1"
+                "00": "level2_M_th_1",
+                "01": "level2_M_th_1",
+                "02": "level2_M_th_1",
+                "03": "level2_M_th_1",
+                "04": "level2_M_th_1",
+                "05": "level2_M_th_1",
+                "06": "level2_M_th_1",
+                "07": "level2_M_th_1",
+                "08": "level2_M_th_1",
+                "09": "level2_M_th_1",
+                "0a": "level2_M_th_1",
+                "0b": "level2_M_th_1",
+                "0c": "level2_M_th_1",
+                "0d": "level2_M_th_1",
+                "0e": "level2_M_th_1",
+                "0f": "level2_M_th_1",
+                "10": "level2_M_th_1",
+                "11": "level2_M_th_1",
+                "12": "level2_M_th_1",
+                "13": "level2_M_th_1",
+                "14": "level2_M_th_1",
+                "15": "level2_M_th_1",
+                "16": "level2_M_th_1",
+                "17": "level2_M_th_1",
+                "18": "level2_M_th_1",
+                "19": "level2_M_th_1",
+                "1a": "level2_M_th_1",
+                "1b": "level2_M_th_1",
+                "1c": "level2_M_th_1",
+                "1d": "level2_M_th_1",
+                "1e": "level2_M_th_1",
+                "1f": "level2_M_th_1"
             }
         },
         "7a0e": {
@@ -25832,13 +25832,12 @@
                 "07": "level2_M_th_1"
             },
             "0f": {
-                "00": "pau0_M_th_1",
-                "03": "pau3_M_th_1",
-                "04": "pau4_M_th_1",
-                "05": "pau5_M_th_1",
-                "06": "pau6_M_th_1",
-                "07": "pau7_M_th_1",
-                "flags": ["cs_possible"]
+                "00": "level2_M_th_1",
+                "03": "level2_M_th_1",
+                "04": "level2_M_th_1",
+                "05": "level2_M_th_1",
+                "06": "level2_M_th_1",
+                "07": "level2_M_th_1"
             },
             "10": {
                 "00": "level2_M_th_1",