diff --git a/data/Map031.json b/data/Map031.json
index 5a82cfe..32bfdbf 100644
--- a/data/Map031.json
+++ b/data/Map031.json
@@ -30380,7 +30380,7 @@
         {
             "id": 73,
             "name": "扉（市街地）",
-            "note": "<namePop:Public_Bath_0>",
+            "note": "<namePop:Public_Bath 0 ",
             "pages": [
                 {
                     "conditions": {
@@ -33333,7 +33333,7 @@
         {
             "id": 113,
             "name": "EV113",
-            "note": "<namePop:!_0>",
+            "note": "<namePop:! 0 ",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map032.json b/data/Map032.json
index 010e620..acd7450 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": {
diff --git a/data/Map034.json b/data/Map034.json
index de879f4..bf35bcf 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": {
diff --git a/data/Map036.json b/data/Map036.json
index 207b017..1607bae 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": {
@@ -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": {