diff --git a/data/Actors.json b/data/Actors.json
index e25b911..1ec35f6 100644
--- a/data/Actors.json
+++ b/data/Actors.json
@@ -528,7 +528,7 @@
         "initialLevel": 1,
         "maxLevel": 99,
         "name": "Onma Tadakatsu",
-        "nickname": "Ouma Tadakatsu",
+        "nickname": "Gouma Tadakatsu",
         "note": "",
         "profile": ""
     },
diff --git a/data/Enemies.json b/data/Enemies.json
index e94b06c..4342e17 100644
--- a/data/Enemies.json
+++ b/data/Enemies.json
@@ -6916,7 +6916,7 @@
             }
         ],
         "gold": 100,
-        "name": "Ouma Tadakatsu",
+        "name": "Gouma Tadakatsu",
         "note": "<BigEnemy>\n<enmAnim>\n<enmAnim_updateRate:20>\n<enmAnim_numOfFrame:3>\n<enmAnim_framePattern:1,2,3,2>\n<enmAnim_states:49>",
         "params": [
             15490,
diff --git a/data/Map140.json b/data/Map140.json
index 88b34cc..6057607 100644
--- a/data/Map140.json
+++ b/data/Map140.json
@@ -5026,7 +5026,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "It's for the sake of Ouma. ...Well then, I shall\ngo and die."
+                                "It's for the sake of Sakuraba. ...Well then, I shall\ngo and die."
                             ]
                         },
                         {
diff --git a/data/Map215.json b/data/Map215.json
index e6e70ac..d095fc3 100644
--- a/data/Map215.json
+++ b/data/Map215.json
@@ -8364,7 +8364,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "Take what you desire with your sword!\nOvercome disrespect with force! Before you\nstands the great daimyo of Sakuraba...\nFirewood-Chopper Ouma!!!"
+                                "Take what you desire with your sword!\nOvercome disrespect with force! Before you\nstands the great daimyo of Sakuraba...\nFirewood-Chopper Gouma!!!"
                             ]
                         },
                         {
diff --git a/data/Skills.json b/data/Skills.json
index 30a738f..d34aa3e 100644
--- a/data/Skills.json
+++ b/data/Skills.json
@@ -3907,7 +3907,7 @@
         "message1": "(\\*skill[96]) A heavy blow from %1!",
         "message2": "",
         "mpCost": 1,
-        "name": "Ouma's Sword",
+        "name": "Gouma's Sword",
         "note": "<WAT:\\I[290]><TemplateIndex:2>\n<WATs:[\\I[36] Grant][\\I[272]\\I[274] Grant]>",
         "occasion": 1,
         "repeats": 1,
@@ -10396,10 +10396,10 @@
         ],
         "hitType": 0,
         "iconIndex": 278,
-        "message1": "(\\I[27] Sakura Baryu Firewood Splitting) Super One Slash of %1!",
+        "message1": "(\\I[27] Sakuraba Style Log Splitter) Super One Slash of %1!",
         "message2": "",
         "mpCost": 0,
-        "name": "[Event] Sakuraba Style Log Splitting",
+        "name": "[Event] Sakuraba Style Log Splitter",
         "note": "<useDefaultFormula>",
         "occasion": 1,
         "repeats": 1,
diff --git a/data/Weapons.json b/data/Weapons.json
index 41b8223..0bba649 100644
--- a/data/Weapons.json
+++ b/data/Weapons.json
@@ -3048,7 +3048,7 @@
             }
         ],
         "iconIndex": 105,
-        "name": "Ouma's Sword",
+        "name": "Gouma's Sword",
         "note": "<MaxItems: 1> <cate:0> <WeaponType: 15>\n<WAT:\\I[290][\\I[296]:1]><TemplateIndex:2>\n<WATs:[\\I[36]+][\\I[272]\\I[274]+]>\n<mat1:W95*1> <mat2:I52*1> <mat3:I41*2>\n<matKey:1>\n<SG種別:1> <SGカテゴリ:Weapon> <SG手動>\n<SG説明:\\wptext[96]>  ",
         "params": [
             0,
diff --git a/glossary/GlossarySPText.dat b/glossary/GlossarySPText.dat
index b7748d5..99a41b5 100644
--- a/glossary/GlossarySPText.dat
+++ b/glossary/GlossarySPText.dat
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // 301～350(100)
 //count6 Suzune, Ouka, Enka, Kirari, Tamago, Gufu,
-//count6 Edakiri Harara, Edakiri Hasami, Ouma Tadakatsu, Hanahiru, Kokko, Nurari,
+//count6 Edakiri Harara, Edakiri Hasami, Gouma Tadakatsu, Hanahiru, Kokko, Nurari,
 //count6 Hachishaku, Ningyoushi, xxx, xxx, xxx, xxx
 //count3 Inoshikoma-cho, Gozamon, Edakiri Hasumi,
 //count4 Yamada Air, No. 17, No. 19, No. 28
@@ -125,7 +125,7 @@ Suzune is mightier.
 @end
 
 @start 312
-\ac\{【Character: Ouma Tadakatsu】\}
+\ac\{【Character: Gouma Tadakatsu】\}
 
 Lord. Older grandpa.
 Top of the mightiest samurai.
@@ -511,7 +511,7 @@ but mainly through mucosal contact such as intercourse.
 @start 384
 \ac\{【Mononoke Great War】\}
 
-A great war where Ouma Tadakatsu collaborated with demons to suppress 
+A great war where Onma Tadakatsu collaborated with demons to suppress 
 the disease.
 
 With the help of the Three Great Youkai, he fought to subdue the 
diff --git a/glossary/GlossaryWeaponText.dat b/glossary/GlossaryWeaponText.dat
index 2693e79..1ed9f9a 100644
--- a/glossary/GlossaryWeaponText.dat
+++ b/glossary/GlossaryWeaponText.dat
@@ -237,7 +237,7 @@ handled this special wakizashi.
 
 Using a sharp, light blade, they ended many lives.
 
-It was given to the Sakura household that adored Ouma
+It was given to the Sakura household that adored Onma
 Tadakatsu, used as a kitchen knife in the peaceful era.
 @end