diff --git a/data/Map046.json b/data/Map046.json
index 9b28bf4..821c3b3 100644
--- a/data/Map046.json
+++ b/data/Map046.json
@@ -21169,7 +21169,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "(Tiger horse...?) Oh...! How brave of my\ndisciple...! In return, let's raise the reward and\neat some delicious food to our hearts' content...!"
+                                "(Tiger Uma...?) Oh...! How brave of my\ndisciple...! In return, let's raise the reward and\neat some delicious food to our hearts' content...!"
                             ]
                         },
                         {
diff --git a/data/Map171.json b/data/Map171.json
index 63b90ec..cf09530 100644
--- a/data/Map171.json
+++ b/data/Map171.json
@@ -6143,7 +6143,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "Exactly! If Sakura's horse goes wild, yokai will\nbe in danger anyway...! After that, you can make\npeace with the samurai!!"
+                                "Exactly! If Sakura Uma goes wild, yokai will\nbe in danger anyway...! After that, you can make\npeace with the samurai!!"
                             ]
                         },
                         {
@@ -6171,7 +6171,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "Don't worry? The research on Sakura's horse's\nspirit disease... Whether it exists or not, Kirari\nand I will make sure to snatch it away. ...So..."
+                                "Don't worry? The research on Sakura's Uma's\nspirit disease... Whether it exists or not, Kirari\nand I will make sure to snatch it away. ...So..."
                             ]
                         },
                         {
@@ -8046,7 +8046,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "Are you an idiot!? Even I'm appalled!! And Sakura,\ndon't give it away!! Are the samurai of Sakura's\nhorse madmen and perverts for exchanging urine\nbetween east and west!?"
+                                "Are you an idiot!? Even I'm appalled!! And Sakura,\ndon't give it away!! Are the samurai of Sakura\nUma madmen and perverts for exchanging urine\nbetween east and west!?"
                             ]
                         },
                         {
diff --git a/data/Map204.json b/data/Map204.json
index 1b2ad10..52d32ad 100644
--- a/data/Map204.json
+++ b/data/Map204.json
@@ -7274,7 +7274,7 @@
                             "code": 405,
                             "indent": 0,
                             "parameters": [
-                                "[Chapter3 \\c[18]Ouma\\c[0] END]  \\c[27]Sakura\\c[0]\nHorse Ablaze Ouma Incident"
+                                "[Chapter3 \\c[18]Ouma\\c[0] END]  \\c[27]Sakura\\c[0]\nUma Ablaze Ouma Incident"
                             ]
                         },
                         {
diff --git a/data/Map209.json b/data/Map209.json
index 3996415..ed6254a 100644
--- a/data/Map209.json
+++ b/data/Map209.json
@@ -15851,7 +15851,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "*That night, as if to vent his frustration, Tamago\nbullied Sakura... Losing all his essence to the\nlimit, a shrunken man was born on Sakura's\nhorse..."
+                                "*That night, as if to vent his frustration, Tamago\nbullied Sakura... Losing all his essence to the\nlimit, a shrunken man was born in Sakura\nUma..."
                             ]
                         },
                         {
diff --git a/data/Map215.json b/data/Map215.json
index 97baa0b..7574570 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! Overcome\nrudeness with force! Before you stands the great\ndaimyo of the Sakura clan! ...The mighty horse-\nsplitter, that is who you face!"
+                                "Take what you desire with your sword! Overcome\nrudeness with force! Before you stands the great\ndaimyo of the Sakura clan! ...The mighty Uma-\nsplitter, that is who you face!"
                             ]
                         },
                         {
diff --git a/data/Map221.json b/data/Map221.json
index b817cff..38ad9a0 100644
--- a/data/Map221.json
+++ b/data/Map221.json
@@ -64698,7 +64698,7 @@
                             "code": 401,
                             "indent": 1,
                             "parameters": [
-                                "\\ac \\I[301] The Cherry Horse Burns"
+                                "\\ac \\I[301] The Cherry Uma Burns"
                             ]
                         },
                         {
diff --git a/data/Map242.json b/data/Map242.json
index ccd251d..8b5ae58 100644
--- a/data/Map242.json
+++ b/data/Map242.json
@@ -5940,7 +5940,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "Tiger... conquers...! Horse... beautiful...!\n Tiger... Horse... ugh..."
+                                "Tiger... conquers...! Uma... beautiful...!\n Tiger... Uma... ugh..."
                             ]
                         },
                         {
diff --git a/data/Skills.json b/data/Skills.json
index e999541..38a82af 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": "Great Horse Sword",
+        "name": "Great Uma Sword",
         "note": "<WAT:\\I[290]><TemplateIndex:2>\n<WATs:[\\I[36] Grant][\\I[272]\\I[274] Grant]>",
         "occasion": 1,
         "repeats": 1,
diff --git a/data/Weapons.json b/data/Weapons.json
index da34bae..7a2bd5e 100644
--- a/data/Weapons.json
+++ b/data/Weapons.json
@@ -3048,7 +3048,7 @@
             }
         ],
         "iconIndex": 105,
-        "name": "Great Horse's Sword",
+        "name": "Great Uma's Sword",
         "note": "<MaxItems: 1> <cate:0> <WeaponType: 15>\n<WAT:\\I[290][\\I[296]:1]><TemplateIndex:2>\n<WATs:[\\I[36] Grant][\\I[272]\\I[274] Grant]>\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/GlossaryWeaponText.dat b/glossary/GlossaryWeaponText.dat
index 67e485a..5d0be77 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 Sakurahorse Tadatoki, 
+It was given to the Sakura household that adored Sakura Uma Tadatoki, 
 used as a kitchen knife in the peaceful era.
 @end