diff --git a/data/CommonEvents.json b/data/CommonEvents.json
index bfbbbc8..5de751f 100644
--- a/data/CommonEvents.json
+++ b/data/CommonEvents.json
@@ -4639,7 +4639,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Contamination   \\V[21]/20"
+                    "テキスト-Contamination   \\\\V[21]/20"
                 ]
             },
             {
@@ -4674,7 +4674,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Orgasms   \\V[22]x"
+                    "テキスト-Orgasms   \\\\V[22]x"
                 ]
             },
             {
@@ -4709,7 +4709,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Cum Extracted   \\V[23]ml"
+                    "テキスト-Cum Extracted   \\\\V[23]ml"
                 ]
             },
             {
@@ -4744,7 +4744,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Love Juices Produced   \\V[24]ml"
+                    "テキスト-Love Juices Produced   \\\\V[24]ml"
                 ]
             },
             {
@@ -4779,7 +4779,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Mouth   \\V[25]"
+                    "テキスト-Development -Mouth   \\\\V[25]"
                 ]
             },
             {
@@ -4814,7 +4814,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Breasts   \\V[26]"
+                    "テキスト-Development -Breasts   \\\\V[26]"
                 ]
             },
             {
@@ -4849,7 +4849,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Pussy   \\V[27]"
+                    "テキスト-Development -Pussy   \\\\V[27]"
                 ]
             },
             {
@@ -5856,7 +5856,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Contamination    \\V[28]/20"
+                    "テキスト-Contamination    \\\\V[28]/20"
                 ]
             },
             {
@@ -5891,7 +5891,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Orgasms          \\V[29]x"
+                    "テキスト-Orgasms          \\\\V[29]x"
                 ]
             },
             {
@@ -5926,7 +5926,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Cum Extracted    \\V[30]ml"
+                    "テキスト-Cum Extracted    \\\\V[30]ml"
                 ]
             },
             {
@@ -5961,7 +5961,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Juices Produced  \\V[31]ml"
+                    "テキスト-Juices Produced  \\\\V[31]ml"
                 ]
             },
             {
@@ -5996,7 +5996,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Mouth   \\V[32]"
+                    "テキスト-Development -Mouth   \\\\V[32]"
                 ]
             },
             {
@@ -6031,7 +6031,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Breasts \\V[33]"
+                    "テキスト-Development -Breasts \\\\V[33]"
                 ]
             },
             {
@@ -6066,7 +6066,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Pussy   \\V[34]"
+                    "テキスト-Development -Pussy   \\\\V[34]"
                 ]
             },
             {
@@ -7073,7 +7073,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Contamination    \\V[35]/20"
+                    "テキスト-Contamination    \\\\V[35]/20"
                 ]
             },
             {
@@ -7108,7 +7108,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Orgasms         \\V[36]x"
+                    "テキスト-Orgasms         \\\\V[36]x"
                 ]
             },
             {
@@ -7143,7 +7143,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Cum Extracted   \\V[37]ml"
+                    "テキスト-Cum Extracted   \\\\V[37]ml"
                 ]
             },
             {
@@ -7178,7 +7178,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Juices Produced \\V[38]ml"
+                    "テキスト-Juices Produced \\\\V[38]ml"
                 ]
             },
             {
@@ -7213,7 +7213,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Mouth   \\V[39]"
+                    "テキスト-Development -Mouth   \\\\V[39]"
                 ]
             },
             {
@@ -7248,7 +7248,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Breasts \\V[40]"
+                    "テキスト-Development -Breasts \\\\V[40]"
                 ]
             },
             {
@@ -7283,7 +7283,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Pussy   \\V[41]"
+                    "テキスト-Development -Pussy   \\\\V[41]"
                 ]
             },
             {
@@ -22403,7 +22403,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Contamination    \\V[101]/20"
+                    "テキスト-Contamination    \\\\V[101]/20"
                 ]
             },
             {
@@ -22438,7 +22438,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Orgasms         \\V[102]x"
+                    "テキスト-Orgasms         \\\\V[102]x"
                 ]
             },
             {
@@ -22473,7 +22473,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Cum Extracted   \\V[103]ml"
+                    "テキスト-Cum Extracted   \\\\V[103]ml"
                 ]
             },
             {
@@ -22508,7 +22508,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Juices Produced \\V[104]ml"
+                    "テキスト-Juices Produced \\\\V[104]ml"
                 ]
             },
             {
@@ -22543,7 +22543,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Mouth   \\V[105]"
+                    "テキスト-Development -Mouth   \\\\V[105]"
                 ]
             },
             {
@@ -22578,7 +22578,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Breasts \\V[106]"
+                    "テキスト-Development -Breasts \\\\V[106]"
                 ]
             },
             {
@@ -22613,7 +22613,7 @@
                 "code": 655,
                 "indent": 0,
                 "parameters": [
-                    "テキスト-Development -Pussy   \\V[107]"
+                    "テキスト-Development -Pussy   \\\\V[107]"
                 ]
             },
             {
diff --git a/data/Map005.json b/data/Map005.json
index 1898f2c..d4543b8 100644
--- a/data/Map005.json
+++ b/data/Map005.json
@@ -4644,7 +4644,7 @@
         {
             "id": 17,
             "name": "EV017",
-            "note": "<namePop:！ 0 blue>",
+            "note": "<namePop:！_0_blue>",
             "pages": [
                 {
                     "conditions": {
@@ -5916,7 +5916,7 @@
         {
             "id": 20,
             "name": "EV020",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -7876,7 +7876,7 @@
         {
             "id": 25,
             "name": "EV025",
-            "note": "<namePop:DLC 0 red>",
+            "note": "<namePop:DLC_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -8135,7 +8135,7 @@
         {
             "id": 26,
             "name": "EV026",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -8336,7 +8336,7 @@
         {
             "id": 27,
             "name": "EV027",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map009.json b/data/Map009.json
index d008c79..17bbf74 100644
--- a/data/Map009.json
+++ b/data/Map009.json
@@ -3197,7 +3197,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map010.json b/data/Map010.json
index 5b8c454..b6f1608 100644
--- a/data/Map010.json
+++ b/data/Map010.json
@@ -3130,7 +3130,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map011.json b/data/Map011.json
index e19bdc6..9db7599 100644
--- a/data/Map011.json
+++ b/data/Map011.json
@@ -4145,7 +4145,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map012.json b/data/Map012.json
index 65ac7f2..b4dec64 100644
--- a/data/Map012.json
+++ b/data/Map012.json
@@ -3038,7 +3038,7 @@
         {
             "id": 3,
             "name": "情報部",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -4769,7 +4769,7 @@
         {
             "id": 5,
             "name": "技術部",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -7390,7 +7390,7 @@
         {
             "id": 6,
             "name": "技術部",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -9763,7 +9763,7 @@
         {
             "id": 23,
             "name": "EV023",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -10511,7 +10511,7 @@
         {
             "id": 24,
             "name": "EV024",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -11283,7 +11283,7 @@
         {
             "id": 25,
             "name": "EV025",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -12062,7 +12062,7 @@
         {
             "id": 26,
             "name": "",
-            "note": "<namePop:！ 0 blue>",
+            "note": "<namePop:！_0_blue>",
             "pages": [
                 {
                     "conditions": {
@@ -12180,7 +12180,7 @@
         {
             "id": 27,
             "name": "EV027",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -12692,7 +12692,7 @@
         {
             "id": 28,
             "name": "EV028",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map013.json b/data/Map013.json
index 115c743..63648fa 100644
--- a/data/Map013.json
+++ b/data/Map013.json
@@ -4070,7 +4070,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -6602,7 +6602,7 @@
         {
             "id": 2,
             "name": "EV002",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -7711,7 +7711,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -7911,7 +7911,7 @@
         {
             "id": 15,
             "name": "EV015",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -8060,7 +8060,7 @@
         {
             "id": 16,
             "name": "技術部",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map014.json b/data/Map014.json
index cacf83e..361517f 100644
--- a/data/Map014.json
+++ b/data/Map014.json
@@ -4359,7 +4359,7 @@
         {
             "id": 9,
             "name": "",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map015.json b/data/Map015.json
index bbc0a4a..e0fe724 100644
--- a/data/Map015.json
+++ b/data/Map015.json
@@ -4197,7 +4197,7 @@
         {
             "id": 3,
             "name": "EV003",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map016.json b/data/Map016.json
index 50cb1fb..c495361 100644
--- a/data/Map016.json
+++ b/data/Map016.json
@@ -4010,7 +4010,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map017.json b/data/Map017.json
index 8ef7e4a..40a950e 100644
--- a/data/Map017.json
+++ b/data/Map017.json
@@ -5979,7 +5979,7 @@
         {
             "id": 2,
             "name": "EV002",
-            "note": "<namePop:バイト>",
+            "note": "<namePop:Part-time_job>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map018.json b/data/Map018.json
index e1230c9..0d19356 100644
--- a/data/Map018.json
+++ b/data/Map018.json
@@ -12134,7 +12134,7 @@
         {
             "id": 1,
             "name": "",
-            "note": "<namePop:全開放>",
+            "note": "<namePop:Fully_Unlocked>",
             "pages": [
                 {
                     "conditions": {
@@ -13084,7 +13084,7 @@
         {
             "id": 10,
             "name": "CG",
-            "note": "<namePop:常識改変:学校>",
+            "note": "<namePop:Common_Sense_Alteration:_School>",
             "pages": [
                 {
                     "conditions": {
@@ -13312,7 +13312,7 @@
         {
             "id": 11,
             "name": "CG",
-            "note": "<namePop:チャラ男NTR>",
+            "note": "<namePop:Playboy_NTR>",
             "pages": [
                 {
                     "conditions": {
@@ -13540,7 +13540,7 @@
         {
             "id": 12,
             "name": "CG",
-            "note": "<namePop:鎌鼬>",
+            "note": "<namePop:Sickle_Weasel>",
             "pages": [
                 {
                     "conditions": {
@@ -13768,7 +13768,7 @@
         {
             "id": 13,
             "name": "CG",
-            "note": "<namePop:戦闘員>",
+            "note": "<namePop:Combatant>",
             "pages": [
                 {
                     "conditions": {
@@ -13996,7 +13996,7 @@
         {
             "id": 14,
             "name": "CG",
-            "note": "<namePop:くすぐり怪人>",
+            "note": "<namePop:Tickle_Monster>",
             "pages": [
                 {
                     "conditions": {
@@ -14224,7 +14224,7 @@
         {
             "id": 15,
             "name": "CG",
-            "note": "<namePop:幹部>",
+            "note": "<namePop:Executive>",
             "pages": [
                 {
                     "conditions": {
@@ -14452,7 +14452,7 @@
         {
             "id": 16,
             "name": "CG",
-            "note": "<namePop:触手怪獣>",
+            "note": "<namePop:Tentacle_Beast>",
             "pages": [
                 {
                     "conditions": {
@@ -14680,7 +14680,7 @@
         {
             "id": 17,
             "name": "CG",
-            "note": "<namePop:乳搾り>",
+            "note": "<namePop:Milking>",
             "pages": [
                 {
                     "conditions": {
@@ -14908,7 +14908,7 @@
         {
             "id": 18,
             "name": "CG",
-            "note": "<namePop:改造兵士:手術>",
+            "note": "<namePop:Modified_Soldier:_Surgery>",
             "pages": [
                 {
                     "conditions": {
@@ -15136,7 +15136,7 @@
         {
             "id": 19,
             "name": "CG",
-            "note": "<namePop:改造兵士:奉仕>",
+            "note": "<namePop:Modified_Soldier:_Service>",
             "pages": [
                 {
                     "conditions": {
@@ -15364,7 +15364,7 @@
         {
             "id": 20,
             "name": "CG",
-            "note": "<namePop:改造兵士:市民>",
+            "note": "<namePop:Modified_Soldier:_Citizen>",
             "pages": [
                 {
                     "conditions": {
@@ -15592,7 +15592,7 @@
         {
             "id": 21,
             "name": "CG",
-            "note": "<namePop:電車で>",
+            "note": "<namePop:On_the_train>",
             "pages": [
                 {
                     "conditions": {
@@ -15820,7 +15820,7 @@
         {
             "id": 22,
             "name": "CG",
-            "note": "<namePop:常識改変:学校>",
+            "note": "<namePop:Common_Sense_Alteration:_School>",
             "pages": [
                 {
                     "conditions": {
@@ -16048,7 +16048,7 @@
         {
             "id": 23,
             "name": "CG",
-            "note": "<namePop:媚薬蔓延カプセル>",
+            "note": "<namePop:Aphrodisiac-Filled_Capsule>",
             "pages": [
                 {
                     "conditions": {
@@ -16276,7 +16276,7 @@
         {
             "id": 24,
             "name": "CG",
-            "note": "<namePop:戦闘員>",
+            "note": "<namePop:Combatant>",
             "pages": [
                 {
                     "conditions": {
@@ -16504,7 +16504,7 @@
         {
             "id": 25,
             "name": "CG",
-            "note": "<namePop:デブオタク>",
+            "note": "<namePop:Fat_Otaku>",
             "pages": [
                 {
                     "conditions": {
@@ -16732,7 +16732,7 @@
         {
             "id": 26,
             "name": "CG",
-            "note": "<namePop:触手怪獣>",
+            "note": "<namePop:Tentacle_Beast>",
             "pages": [
                 {
                     "conditions": {
@@ -16960,7 +16960,7 @@
         {
             "id": 27,
             "name": "CG",
-            "note": "<namePop:洗脳されて>",
+            "note": "<namePop:Brainwashed>",
             "pages": [
                 {
                     "conditions": {
@@ -17188,7 +17188,7 @@
         {
             "id": 28,
             "name": "CG",
-            "note": "<namePop:目隠しおもちゃ尋問>",
+            "note": "<namePop:Blindfold_Toy_Interrogation>",
             "pages": [
                 {
                     "conditions": {
@@ -17416,7 +17416,7 @@
         {
             "id": 29,
             "name": "CG",
-            "note": "<namePop:改造兵士:手術>",
+            "note": "<namePop:Modified_Soldier:_Surgery>",
             "pages": [
                 {
                     "conditions": {
@@ -17644,7 +17644,7 @@
         {
             "id": 30,
             "name": "CG",
-            "note": "<namePop:改造兵士:奉仕>",
+            "note": "<namePop:Modified_Soldier:_Service>",
             "pages": [
                 {
                     "conditions": {
@@ -17872,7 +17872,7 @@
         {
             "id": 31,
             "name": "CG",
-            "note": "<namePop:改造兵士:市民>",
+            "note": "<namePop:Modified_Soldier:_Citizen>",
             "pages": [
                 {
                     "conditions": {
@@ -18100,7 +18100,7 @@
         {
             "id": 32,
             "name": "CG",
-            "note": "<namePop:性感マッサージ>",
+            "note": "<namePop:Sensual_Massage>",
             "pages": [
                 {
                     "conditions": {
@@ -18328,7 +18328,7 @@
         {
             "id": 33,
             "name": "CG",
-            "note": "<namePop:常識改変:大衆浴場>",
+            "note": "<namePop:Common_Sense_Alteration:_Public_Bathhouse>",
             "pages": [
                 {
                     "conditions": {
@@ -18556,7 +18556,7 @@
         {
             "id": 34,
             "name": "CG",
-            "note": "<namePop:毒蛇からの救助>",
+            "note": "<namePop:Rescue_from_the_Viper>",
             "pages": [
                 {
                     "conditions": {
@@ -18784,7 +18784,7 @@
         {
             "id": 35,
             "name": "CG",
-            "note": "<namePop:戦闘員>",
+            "note": "<namePop:Combatant>",
             "pages": [
                 {
                     "conditions": {
@@ -19012,7 +19012,7 @@
         {
             "id": 36,
             "name": "CG",
-            "note": "<namePop:巨大植物>",
+            "note": "<namePop:Giant_Plant>",
             "pages": [
                 {
                     "conditions": {
@@ -19240,7 +19240,7 @@
         {
             "id": 37,
             "name": "CG",
-            "note": "<namePop:公衆肉便器>",
+            "note": "<namePop:Public_Meat_Toilet>",
             "pages": [
                 {
                     "conditions": {
@@ -19468,7 +19468,7 @@
         {
             "id": 38,
             "name": "CG",
-            "note": "<namePop:快楽地獄>",
+            "note": "<namePop:Pleasure_Hell>",
             "pages": [
                 {
                     "conditions": {
@@ -19696,7 +19696,7 @@
         {
             "id": 39,
             "name": "CG",
-            "note": "<namePop:改造兵士:手術>",
+            "note": "<namePop:Modified_Soldier:_Surgery>",
             "pages": [
                 {
                     "conditions": {
@@ -19924,7 +19924,7 @@
         {
             "id": 40,
             "name": "CG",
-            "note": "<namePop:改造兵士:奉仕>",
+            "note": "<namePop:Modified_Soldier:_Service>",
             "pages": [
                 {
                     "conditions": {
@@ -20152,7 +20152,7 @@
         {
             "id": 41,
             "name": "CG",
-            "note": "<namePop:改造兵士:市民>",
+            "note": "<namePop:Modified_Soldier:_Citizen>",
             "pages": [
                 {
                     "conditions": {
@@ -20380,7 +20380,7 @@
         {
             "id": 42,
             "name": "CG",
-            "note": "<namePop:Modified_Soldier:3人で奉仕>",
+            "note": "<namePop:Service_by_the_three_of_us>",
             "pages": [
                 {
                     "conditions": {
@@ -20675,7 +20675,7 @@
         {
             "id": 44,
             "name": "",
-            "note": "<namePop:チート武器>",
+            "note": "<namePop:Cheat_Weapon>",
             "pages": [
                 {
                     "conditions": {
@@ -22149,7 +22149,7 @@
         {
             "id": 63,
             "name": "CG",
-            "note": "<namePop:オナニー>",
+            "note": "<namePop:Masturbation>",
             "pages": [
                 {
                     "conditions": {
@@ -22377,7 +22377,7 @@
         {
             "id": 64,
             "name": "CG",
-            "note": "<namePop:催眠アプリ>",
+            "note": "<namePop:Hypnosis_App>",
             "pages": [
                 {
                     "conditions": {
@@ -22605,7 +22605,7 @@
         {
             "id": 65,
             "name": "CG",
-            "note": "<namePop:戦闘員>",
+            "note": "<namePop:Combatant>",
             "pages": [
                 {
                     "conditions": {
@@ -22833,7 +22833,7 @@
         {
             "id": 66,
             "name": "CG",
-            "note": "<namePop:巨大植物>",
+            "note": "<namePop:Giant_Plant>",
             "pages": [
                 {
                     "conditions": {
@@ -23061,7 +23061,7 @@
         {
             "id": 67,
             "name": "CG",
-            "note": "<namePop:スライム>",
+            "note": "<namePop:Slime>",
             "pages": [
                 {
                     "conditions": {
@@ -23289,7 +23289,7 @@
         {
             "id": 68,
             "name": "CG",
-            "note": "<namePop:AV撮影>",
+            "note": "<namePop:AV_Filming>",
             "pages": [
                 {
                     "conditions": {
@@ -23517,7 +23517,7 @@
         {
             "id": 69,
             "name": "CG",
-            "note": "<namePop:三角木馬>",
+            "note": "<namePop:Wooden_horse>",
             "pages": [
                 {
                     "conditions": {
@@ -23745,7 +23745,7 @@
         {
             "id": 70,
             "name": "CG",
-            "note": "<namePop:改造兵士:手術>",
+            "note": "<namePop:Modified_Soldier:_Surgery>",
             "pages": [
                 {
                     "conditions": {
@@ -23973,7 +23973,7 @@
         {
             "id": 71,
             "name": "CG",
-            "note": "<namePop:改造兵士:奉仕>",
+            "note": "<namePop:Modified_Soldier:_Service>",
             "pages": [
                 {
                     "conditions": {
@@ -24201,7 +24201,7 @@
         {
             "id": 72,
             "name": "CG",
-            "note": "<namePop:改造兵士:市民>",
+            "note": "<namePop:Modified_Soldier:_Citizen>",
             "pages": [
                 {
                     "conditions": {
@@ -24429,7 +24429,7 @@
         {
             "id": 73,
             "name": "CG",
-            "note": "<namePop:足コキ>",
+            "note": "<namePop:Footjob>",
             "pages": [
                 {
                     "conditions": {
@@ -24657,7 +24657,7 @@
         {
             "id": 74,
             "name": "CG",
-            "note": "<namePop:枕営業>",
+            "note": "<namePop:Pillow_business>",
             "pages": [
                 {
                     "conditions": {
@@ -24885,7 +24885,7 @@
         {
             "id": 75,
             "name": "CG",
-            "note": "<namePop:対面騎乗位>",
+            "note": "<namePop:Cowgirl_(facing_partner)>",
             "pages": [
                 {
                     "conditions": {
@@ -25113,7 +25113,7 @@
         {
             "id": 76,
             "name": "CG",
-            "note": "<namePop:キス手コキ>",
+            "note": "<namePop:Kiss_Handjob>",
             "pages": [
                 {
                     "conditions": {
@@ -25341,7 +25341,7 @@
         {
             "id": 77,
             "name": "CG",
-            "note": "<namePop:バニー接待>",
+            "note": "<namePop:Bunny_Hospitality>",
             "pages": [
                 {
                     "conditions": {
@@ -25569,7 +25569,7 @@
         {
             "id": 78,
             "name": "CG",
-            "note": "<namePop:立ちバック>",
+            "note": "<namePop:Standing_doggy_style>",
             "pages": [
                 {
                     "conditions": {
@@ -25797,7 +25797,7 @@
         {
             "id": 79,
             "name": "CG",
-            "note": "<namePop:巨大化>",
+            "note": "<namePop:Giant_Form>",
             "pages": [
                 {
                     "conditions": {
@@ -26025,7 +26025,7 @@
         {
             "id": 80,
             "name": "CG",
-            "note": "<namePop:クラスメイトに見せつけ>",
+            "note": "<namePop:Showing_off_to_classmates>",
             "pages": [
                 {
                     "conditions": {
@@ -26253,7 +26253,7 @@
         {
             "id": 81,
             "name": "CG",
-            "note": "<namePop:正常位>",
+            "note": "<namePop:Missionary_position>",
             "pages": [
                 {
                     "conditions": {
@@ -26481,7 +26481,7 @@
         {
             "id": 82,
             "name": "",
-            "note": "<namePop:全開放>",
+            "note": "<namePop:Fully_Unlocked>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map020.json b/data/Map020.json
index 45dec4c..f5aebc9 100644
--- a/data/Map020.json
+++ b/data/Map020.json
@@ -12568,7 +12568,7 @@
         {
             "id": 22,
             "name": "EV022",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map025.json b/data/Map025.json
index 573e0a9..3e5c7e3 100644
--- a/data/Map025.json
+++ b/data/Map025.json
@@ -15261,7 +15261,7 @@
         {
             "id": 2,
             "name": "出口",
-            "note": "<namePop:! 0 black>",
+            "note": "<namePop:!_0_black>",
             "pages": [
                 {
                     "conditions": {
@@ -15438,7 +15438,7 @@
         {
             "id": 3,
             "name": "EV003",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -15934,7 +15934,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -16430,7 +16430,7 @@
         {
             "id": 5,
             "name": "EV005",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -16926,7 +16926,7 @@
         {
             "id": 6,
             "name": "EV006",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -17747,7 +17747,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -18243,7 +18243,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -18739,7 +18739,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -19235,7 +19235,7 @@
         {
             "id": 11,
             "name": "EV011",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -19731,7 +19731,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
+            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -20651,7 +20651,7 @@
         {
             "id": 14,
             "name": "EV014",
-            "note": "<RateMap:0.5><namePop:♥ 0 blue>",
+            "note": "<RateMap:0.5><namePop:♥_0_blue>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map026.json b/data/Map026.json
index adf758a..eb049d9 100644
--- a/data/Map026.json
+++ b/data/Map026.json
@@ -4387,7 +4387,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -5621,7 +5621,7 @@
         {
             "id": 7,
             "name": "EV007",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -6038,7 +6038,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -6591,7 +6591,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:￥ 0 red>",
+            "note": "<namePop:￥_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -6872,7 +6872,7 @@
         {
             "id": 16,
             "name": "",
-            "note": "<namePop:！ 0 blue>",
+            "note": "<namePop:！_0_blue>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map031.json b/data/Map031.json
index 1cc6fd1..b798bb2 100644
--- a/data/Map031.json
+++ b/data/Map031.json
@@ -26556,7 +26556,7 @@
         {
             "id": 31,
             "name": "EV031",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -29796,7 +29796,7 @@
         {
             "id": 71,
             "name": "扉（市街地）",
-            "note": "<namePop:⇓ 0 red>",
+            "note": "<namePop:⇓_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -30124,7 +30124,7 @@
         {
             "id": 72,
             "name": "",
-            "note": "<namePop:幼馴染男の部屋>",
+            "note": "<namePop:Childhood_Friend_Boy's_Room>",
             "pages": [
                 {
                     "conditions": {
@@ -30380,7 +30380,7 @@
         {
             "id": 73,
             "name": "扉（市街地）",
-            "note": "<namePop:Public_Bath 0>",
+            "note": "<namePop:Public_Bath_0>",
             "pages": [
                 {
                     "conditions": {
@@ -30826,7 +30826,7 @@
         {
             "id": 76,
             "name": "EV076",
-            "note": "<namePop:！ 0 red>",
+            "note": "<namePop:！_0_red>",
             "pages": [
                 {
                     "conditions": {
@@ -33333,7 +33333,7 @@
         {
             "id": 113,
             "name": "EV113",
-            "note": "<namePop:! 0>",
+            "note": "<namePop:!_0>",
             "pages": [
                 {
                     "conditions": {
@@ -39001,7 +39001,7 @@
         {
             "id": 135,
             "name": "",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
@@ -40029,7 +40029,7 @@
         {
             "id": 136,
             "name": "EV136",
-            "note": "<namePop:！ 0 blue>",
+            "note": "<namePop:！_0_blue>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map032.json b/data/Map032.json
index e24ccb3..4405256 100644
--- a/data/Map032.json
+++ b/data/Map032.json
@@ -5025,7 +5025,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<namePop:！ 0>",
+            "note": "<namePop:！_0>",
             "pages": [
                 {
                     "conditions": {
@@ -5768,7 +5768,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map033.json b/data/Map033.json
index 9d963a1..5f8e625 100644
--- a/data/Map033.json
+++ b/data/Map033.json
@@ -4070,7 +4070,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map034.json b/data/Map034.json
index 13581df..cc1013e 100644
--- a/data/Map034.json
+++ b/data/Map034.json
@@ -1502,7 +1502,7 @@
         {
             "id": 3,
             "name": "EV003",
-            "note": "<namePop:Get_off 0>",
+            "note": "<namePop:Get_off_0>",
             "pages": [
                 {
                     "conditions": {
@@ -1934,7 +1934,7 @@
         {
             "id": 7,
             "name": "EV007",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map035.json b/data/Map035.json
index a041a80..cecebd8 100644
--- a/data/Map035.json
+++ b/data/Map035.json
@@ -4528,7 +4528,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<namePop:Gymnasium -48>",
+            "note": "<namePop:Gymnasium_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -4703,7 +4703,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<namePop:Pool -48>",
+            "note": "<namePop:Pool_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -4794,7 +4794,7 @@
         {
             "id": 11,
             "name": "EV011",
-            "note": "<namePop:1-B -48>",
+            "note": "<namePop:1-B_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -4909,7 +4909,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:1-B -48>",
+            "note": "<namePop:1-B_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -5024,7 +5024,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:1-C -48>",
+            "note": "<namePop:1-C_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -5139,7 +5139,7 @@
         {
             "id": 14,
             "name": "EV014",
-            "note": "<namePop:1-C -48>",
+            "note": "<namePop:1-C_-48>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map036.json b/data/Map036.json
index ce89749..207b017 100644
--- a/data/Map036.json
+++ b/data/Map036.json
@@ -4130,7 +4130,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<namePop:2-A 48>",
+            "note": "<namePop:2-A_48>",
             "pages": [
                 {
                     "conditions": {
@@ -4351,7 +4351,7 @@
         {
             "id": 5,
             "name": "EV005",
-            "note": "<namePop:2-A 48>",
+            "note": "<namePop:2-A_48>",
             "pages": [
                 {
                     "conditions": {
@@ -4740,7 +4740,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<namePop:Library -48>",
+            "note": "<namePop:Library_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -4831,7 +4831,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<namePop:2-B -48>",
+            "note": "<namePop:2-B_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -4946,7 +4946,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<namePop:2-B -48>",
+            "note": "<namePop:2-B_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -5061,7 +5061,7 @@
         {
             "id": 11,
             "name": "EV011",
-            "note": "<namePop:2-C -48>",
+            "note": "<namePop:2-C_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -5176,7 +5176,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:2-C -48>",
+            "note": "<namePop:2-C_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -5291,7 +5291,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:Faculty_Room 48>",
+            "note": "<namePop:Faculty_Room_48>",
             "pages": [
                 {
                     "conditions": {
@@ -5512,7 +5512,7 @@
         {
             "id": 14,
             "name": "EV014",
-            "note": "<namePop:Faculty_Room 48>",
+            "note": "<namePop:Faculty_Room_48>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map037.json b/data/Map037.json
index a152deb..ae13ac6 100644
--- a/data/Map037.json
+++ b/data/Map037.json
@@ -4674,7 +4674,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<namePop:Empty_Classroom -48>",
+            "note": "<namePop:Empty_Classroom_-48>",
             "pages": [
                 {
                     "conditions": {
@@ -4765,7 +4765,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<namePop:Empty_Classroom -48>",
+            "note": "<namePop:Empty_Classroom_-48>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map039.json b/data/Map039.json
index ce678c6..0b7aa0b 100644
--- a/data/Map039.json
+++ b/data/Map039.json
@@ -2630,7 +2630,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:体育倉庫>",
+            "note": "<namePop:Equipment_Storage>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map041.json b/data/Map041.json
index 04d6df6..10d27ce 100644
--- a/data/Map041.json
+++ b/data/Map041.json
@@ -2918,7 +2918,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:更衣室>",
+            "note": "<namePop:Changing_Room>",
             "pages": [
                 {
                     "conditions": {
@@ -3452,7 +3452,7 @@
         {
             "id": 6,
             "name": "EV006",
-            "note": "<namePop:School_building -48>",
+            "note": "<namePop:School_building_-48>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map045.json b/data/Map045.json
index 405a050..6aaeef3 100644
--- a/data/Map045.json
+++ b/data/Map045.json
@@ -4239,7 +4239,7 @@
         {
             "id": 7,
             "name": "",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map047.json b/data/Map047.json
index 4ebf255..2ea8a95 100644
--- a/data/Map047.json
+++ b/data/Map047.json
@@ -4505,7 +4505,7 @@
         {
             "id": 2,
             "name": "EV002",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map049.json b/data/Map049.json
index 7ab207c..9105aad 100644
--- a/data/Map049.json
+++ b/data/Map049.json
@@ -4988,7 +4988,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:♥ 0 pink>",
+            "note": "<namePop:♥_0_pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map059.json b/data/Map059.json
index 1986635..a945900 100644
--- a/data/Map059.json
+++ b/data/Map059.json
@@ -5731,7 +5731,7 @@
         {
             "id": 2,
             "name": "EV002",
-            "note": "<namePop:遊ぶ>",
+            "note": "<namePop:Play>",
             "pages": [
                 {
                     "conditions": {
@@ -6308,7 +6308,7 @@
         {
             "id": 5,
             "name": "EV005",
-            "note": "<namePop:風俗店>",
+            "note": "<namePop:Brothel>",
             "pages": [
                 {
                     "conditions": {
@@ -6625,7 +6625,7 @@
         {
             "id": 7,
             "name": "EV007",
-            "note": "<namePop:ロックバー>",
+            "note": "<namePop:Rock_Bar>",
             "pages": [
                 {
                     "conditions": {
@@ -9409,7 +9409,7 @@
         {
             "id": 34,
             "name": "EV034",
-            "note": "<namePop:エロザウルス>",
+            "note": "<namePop:Erozaurus>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map060.json b/data/Map060.json
index e62db5e..c461e84 100644
--- a/data/Map060.json
+++ b/data/Map060.json
@@ -1546,7 +1546,7 @@
         {
             "id": 3,
             "name": "EV003",
-            "note": "<namePop:服>",
+            "note": "<namePop:Clothes>",
             "pages": [
                 {
                     "conditions": {
diff --git a/js/plugins/TMNamePop.js b/js/plugins/TMNamePop.js
index d1c0089..c243bcf 100644
--- a/js/plugins/TMNamePop.js
+++ b/js/plugins/TMNamePop.js
@@ -171,6 +171,7 @@ if (!TMPlugin.InterpreterBase) {
   (function() {
 
     Game_Interpreter.prototype.convertEscapeCharactersTM = function(text) {
+      text = text.replace(/_/g, ' ');
       text = text.replace(/\\/g, '\x1b');
       text = text.replace(/\x1b\x1b/g, '\\');
       text = text.replace(/\x1bV\[(\d+)\]/gi, function() {