diff --git a/data/Actors.json b/data/Actors.json
index 92d8f3f..381e5df 100644
--- a/data/Actors.json
+++ b/data/Actors.json
@@ -1101,7 +1101,7 @@
         "maxLevel": 99,
         "name": "Kuzuo",
         "nickname": "",
-        "note": "<nameEn:Kuzuo>\n<nameJp:Kuzuo>",
+        "note": "<nameEn:Kuzuo>\n<nameJp:クズオ>",
         "profile": ""
     },
     {
@@ -1124,7 +1124,7 @@
         "maxLevel": 99,
         "name": "Gario",
         "nickname": "",
-        "note": "<nameEn:Gario>\n<nameJp:Gario>",
+        "note": "<nameEn:Gario>\n<nameJp:ガリオ>",
         "profile": ""
     },
     {
@@ -1147,7 +1147,7 @@
         "maxLevel": 99,
         "name": "Yakushimaru Numao",
         "nickname": "",
-        "note": "<nameJp:Numao>\n<nameEn:Numao>",
+        "note": "<nameJp:薬師丸 ヌマオ>\n<nameEn:Numao>",
         "profile": ""
     },
     {
@@ -1170,7 +1170,7 @@
         "maxLevel": 99,
         "name": "Shige-san",
         "nickname": "",
-        "note": "<nameJp:Shige>\n<nameEn:Shige san>",
+        "note": "<nameJp:シゲさん>\n<nameEn:Shige san>",
         "profile": ""
     },
     {
@@ -1193,7 +1193,7 @@
         "maxLevel": 99,
         "name": "Takahashi Munashi",
         "nickname": "",
-        "note": "<nameJp:Munashi>\n<nameEn:Munashi>",
+        "note": "<nameJp:高橋 むなし>\n<nameEn:Munashi>",
         "profile": ""
     },
     {
@@ -1214,9 +1214,9 @@
         "traits": [],
         "initialLevel": 1,
         "maxLevel": 99,
-        "name": "Oda Nobu",
+        "name": "Oda Nobbu",
         "nickname": "",
-        "note": "<nameJp:Oda>\n<nameEn:Nobu Oda>",
+        "note": "<nameJp:織田ノッブ>\n<nameEn:Nobu Oda>",
         "profile": ""
     },
     {
@@ -1239,7 +1239,7 @@
         "maxLevel": 99,
         "name": "Suzuki Gonzou",
         "nickname": "",
-        "note": "<nameEn:Gonzou>\n<nameJp:Gonzou>",
+        "note": "<nameEn:Gonzou>\n<nameJp:鈴木 ゴンゾウ>",
         "profile": ""
     },
     {
@@ -1262,7 +1262,7 @@
         "maxLevel": 99,
         "name": "Anal Yasichi",
         "nickname": "",
-        "note": "<nameEn:Yashichi>\n<nameJp:Yasichi>",
+        "note": "<nameEn:Yashichi>\n<nameJp:アナルのヤシチ>",
         "profile": ""
     },
     {
@@ -1285,7 +1285,7 @@
         "maxLevel": 99,
         "name": "Gonzalez",
         "nickname": "",
-        "note": "<nameEn:Gonzalez>\n<nameJp:Gonzalez>",
+        "note": "<nameEn:Gonzalez>\n<nameJp:ゴンザレス>",
         "profile": ""
     },
     {
@@ -1308,7 +1308,7 @@
         "maxLevel": 99,
         "name": "Andre",
         "nickname": "",
-        "note": "<nameEn:Andre>\n<nameJp:Andre>",
+        "note": "<nameEn:Andre>\n<nameJp:アンドレ>",
         "profile": ""
     },
     {
diff --git a/scenario/Scenario.json b/scenario/Scenario.json
index 4c6364d..eb9ec3a 100644
--- a/scenario/Scenario.json
+++ b/scenario/Scenario.json
@@ -2377824,7 +2377824,7 @@
             "parameters": []
         }
     ],
-    "男優_Yasichi_01": [
+    "男優_アナルのヤシチ_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2379117,7 +2379117,7 @@
             "parameters": []
         }
     ],
-    "男優_Yasichi_02": [
+    "男優_アナルのヤシチ_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2379301,7 +2379301,7 @@
             "parameters": []
         }
     ],
-    "男優_Andre_01": [
+    "男優_アンドレ_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2380375,7 +2380375,7 @@
             "parameters": []
         }
     ],
-    "男優_Andre_02": [
+    "男優_アンドレ_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2380486,7 +2380486,7 @@
             "parameters": []
         }
     ],
-    "男優_Gario_01": [
+    "男優_ガリオ_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2381852,7 +2381852,7 @@
             "parameters": []
         }
     ],
-    "男優_Gario_02": [
+    "男優_ガリオ_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2381963,7 +2381963,7 @@
             "parameters": []
         }
     ],
-    "男優_Kuzuo_01": [
+    "男優_クズオ_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2383195,7 +2383195,7 @@
             "parameters": []
         }
     ],
-    "男優_Kuzuo_02": [
+    "男優_クズオ_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2383306,7 +2383306,7 @@
             "parameters": []
         }
     ],
-    "男優_Gonzalez_01": [
+    "男優_ゴンザレス_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2384161,7 +2384161,7 @@
             "parameters": []
         }
     ],
-    "男優_Gonzalez_02": [
+    "男優_ゴンザレス_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2384272,7 +2384272,7 @@
             "parameters": []
         }
     ],
-    "男優_Shige_01": [
+    "男優_シゲさん_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2385200,7 +2385200,7 @@
             "parameters": []
         }
     ],
-    "男優_Shige_02": [
+    "男優_シゲさん_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2390806,7 +2390806,7 @@
             "parameters": []
         }
     ],
-    "男優_Oda_01": [
+    "男優_織田ノッブ_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2391661,7 +2391661,7 @@
             "parameters": []
         }
     ],
-    "男優_Oda_02": [
+    "男優_織田ノッブ_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2392022,7 +2392022,7 @@
             "parameters": []
         }
     ],
-    "男優_Numao_01": [
+    "男優_薬師丸_ヌマオ_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2392658,7 +2392658,7 @@
             "parameters": []
         }
     ],
-    "男優_Numao_02": [
+    "男優_薬師丸_ヌマオ_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2392842,7 +2392842,7 @@
             "parameters": []
         }
     ],
-    "男優_Gonzou_01": [
+    "男優_鈴木_ゴンゾウ_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2393551,7 +2393551,7 @@
             "parameters": []
         }
     ],
-    "男優_Gonzou_02": [
+    "男優_鈴木_ゴンゾウ_02": [
         {
             "code": 355,
             "indent": 0,
@@ -2394847,7 +2394847,7 @@
             "parameters": []
         }
     ],
-    "男優_Munashi_01": [
+    "男優_高橋_むなし_01": [
         {
             "code": 355,
             "indent": 0,
@@ -2395702,7 +2395702,7 @@
             "parameters": []
         }
     ],
-    "男優_Munashi_02": [
+    "男優_高橋_むなし_02": [
         {
             "code": 355,
             "indent": 0,