diff --git a/assets/data/characters/albedo/en.json b/assets/data/characters/albedo/en.json
index 317aa0cdc..95ed893ec 100644
--- a/assets/data/characters/albedo/en.json
+++ b/assets/data/characters/albedo/en.json
@@ -162,6 +162,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/albedo/es.json b/assets/data/characters/albedo/es.json
index 41ae2f954..7d78cf35d 100644
--- a/assets/data/characters/albedo/es.json
+++ b/assets/data/characters/albedo/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/albedo/fr.json b/assets/data/characters/albedo/fr.json
index f1c43fc4c..a4a2bb297 100644
--- a/assets/data/characters/albedo/fr.json
+++ b/assets/data/characters/albedo/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/albedo/jp.json b/assets/data/characters/albedo/jp.json
index 9ec0a23da..c6b13d7bc 100644
--- a/assets/data/characters/albedo/jp.json
+++ b/assets/data/characters/albedo/jp.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/albedo/pt.json b/assets/data/characters/albedo/pt.json
index 98bc0940f..e766402df 100644
--- a/assets/data/characters/albedo/pt.json
+++ b/assets/data/characters/albedo/pt.json
@@ -162,6 +162,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "ESPADA"
+  "visionKey": "GEO",
+  "weaponType": "ESPADA"
 }
diff --git a/assets/data/characters/albedo/ru.json b/assets/data/characters/albedo/ru.json
index a21c4763b..d14f6ce8a 100644
--- a/assets/data/characters/albedo/ru.json
+++ b/assets/data/characters/albedo/ru.json
@@ -87,6 +87,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
-}
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
+}
\ No newline at end of file
diff --git a/assets/data/characters/alhaitham/en.json b/assets/data/characters/alhaitham/en.json
index c0d558e09..9be5edbdd 100644
--- a/assets/data/characters/alhaitham/en.json
+++ b/assets/data/characters/alhaitham/en.json
@@ -186,6 +186,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "DENDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/alhaitham/pt.json b/assets/data/characters/alhaitham/pt.json
index c197794f6..c6ba240bf 100644
--- a/assets/data/characters/alhaitham/pt.json
+++ b/assets/data/characters/alhaitham/pt.json
@@ -186,6 +186,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "ESPADA"
+  "visionKey": "DENDRO",
+  "weaponType": "ESPADA"
 }
diff --git a/assets/data/characters/aloy/en.json b/assets/data/characters/aloy/en.json
index 0a2032d39..97ccb8693 100644
--- a/assets/data/characters/aloy/en.json
+++ b/assets/data/characters/aloy/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/aloy/es.json b/assets/data/characters/aloy/es.json
index 10650d429..fdb0dc506 100644
--- a/assets/data/characters/aloy/es.json
+++ b/assets/data/characters/aloy/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/aloy/fr.json b/assets/data/characters/aloy/fr.json
index a57e72e32..6e57fd14c 100644
--- a/assets/data/characters/aloy/fr.json
+++ b/assets/data/characters/aloy/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/aloy/pt.json b/assets/data/characters/aloy/pt.json
index 296c89d20..70f89c1b6 100644
--- a/assets/data/characters/aloy/pt.json
+++ b/assets/data/characters/aloy/pt.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "ARCO"
+  "visionKey": "CRYO",
+  "weaponType": "ARCO"
 }
diff --git a/assets/data/characters/amber/en.json b/assets/data/characters/amber/en.json
index f28feba8c..c6bc37dc6 100644
--- a/assets/data/characters/amber/en.json
+++ b/assets/data/characters/amber/en.json
@@ -163,8 +163,8 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW",
+  "visionKey": "PYRO",
+  "weaponType": "BOW",
   "outfits": [
     {
       "type": "Alternate",
diff --git a/assets/data/characters/amber/es.json b/assets/data/characters/amber/es.json
index ff97cc933..337be85a9 100644
--- a/assets/data/characters/amber/es.json
+++ b/assets/data/characters/amber/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/amber/fr.json b/assets/data/characters/amber/fr.json
index 269138695..b286e51ff 100644
--- a/assets/data/characters/amber/fr.json
+++ b/assets/data/characters/amber/fr.json
@@ -162,6 +162,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/amber/jp.json b/assets/data/characters/amber/jp.json
index 9ade4c70e..46d89becd 100644
--- a/assets/data/characters/amber/jp.json
+++ b/assets/data/characters/amber/jp.json
@@ -163,6 +163,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/amber/ru.json b/assets/data/characters/amber/ru.json
index 330890ce7..32d55f22a 100644
--- a/assets/data/characters/amber/ru.json
+++ b/assets/data/characters/amber/ru.json
@@ -163,6 +163,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/arataki-itto/en.json b/assets/data/characters/arataki-itto/en.json
index 1cd39f4c2..b33565cd8 100644
--- a/assets/data/characters/arataki-itto/en.json
+++ b/assets/data/characters/arataki-itto/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "GEO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/arataki-itto/fr.json b/assets/data/characters/arataki-itto/fr.json
index a1acd4ca2..73c6972f6 100644
--- a/assets/data/characters/arataki-itto/fr.json
+++ b/assets/data/characters/arataki-itto/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "GEO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/arlecchino/en.json b/assets/data/characters/arlecchino/en.json
index bc98a0be4..03a7363c9 100644
--- a/assets/data/characters/arlecchino/en.json
+++ b/assets/data/characters/arlecchino/en.json
@@ -175,6 +175,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/ayaka/en.json b/assets/data/characters/ayaka/en.json
index 5d0416f0d..8dde7151d 100644
--- a/assets/data/characters/ayaka/en.json
+++ b/assets/data/characters/ayaka/en.json
@@ -177,8 +177,8 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD",
+  "visionKey": "CRYO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Travel",
diff --git a/assets/data/characters/ayaka/es.json b/assets/data/characters/ayaka/es.json
index 13e699e14..070cfd784 100644
--- a/assets/data/characters/ayaka/es.json
+++ b/assets/data/characters/ayaka/es.json
@@ -91,6 +91,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/ayaka/fr.json b/assets/data/characters/ayaka/fr.json
index 1dc899824..21d6dfd10 100644
--- a/assets/data/characters/ayaka/fr.json
+++ b/assets/data/characters/ayaka/fr.json
@@ -93,6 +93,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/ayaka/jp.json b/assets/data/characters/ayaka/jp.json
index 3153107b9..892cf2060 100644
--- a/assets/data/characters/ayaka/jp.json
+++ b/assets/data/characters/ayaka/jp.json
@@ -175,6 +175,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/ayato/en.json b/assets/data/characters/ayato/en.json
index 2e4db04e7..9632887f4 100644
--- a/assets/data/characters/ayato/en.json
+++ b/assets/data/characters/ayato/en.json
@@ -182,6 +182,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/baizhu/en.json b/assets/data/characters/baizhu/en.json
index 612bca9c4..f5fe5fb79 100644
--- a/assets/data/characters/baizhu/en.json
+++ b/assets/data/characters/baizhu/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "DENDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/barbara/en.json b/assets/data/characters/barbara/en.json
index 9d842498b..e2838ae7f 100644
--- a/assets/data/characters/barbara/en.json
+++ b/assets/data/characters/barbara/en.json
@@ -158,8 +158,8 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST",
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST",
   "outfits": [
     {
       "type": "Summer",
diff --git a/assets/data/characters/barbara/es.json b/assets/data/characters/barbara/es.json
index 5189645de..18eb6729a 100644
--- a/assets/data/characters/barbara/es.json
+++ b/assets/data/characters/barbara/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/barbara/fr.json b/assets/data/characters/barbara/fr.json
index 3e06d370f..820327948 100644
--- a/assets/data/characters/barbara/fr.json
+++ b/assets/data/characters/barbara/fr.json
@@ -88,8 +88,8 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST",
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST",
   "outfits": [
     {
       "type": "Été",
diff --git a/assets/data/characters/barbara/jp.json b/assets/data/characters/barbara/jp.json
index 994627933..fa5227d6e 100644
--- a/assets/data/characters/barbara/jp.json
+++ b/assets/data/characters/barbara/jp.json
@@ -156,6 +156,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/beidou/en.json b/assets/data/characters/beidou/en.json
index bfc268e64..996ede0be 100644
--- a/assets/data/characters/beidou/en.json
+++ b/assets/data/characters/beidou/en.json
@@ -178,6 +178,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/beidou/es.json b/assets/data/characters/beidou/es.json
index d990fb10f..97245e632 100644
--- a/assets/data/characters/beidou/es.json
+++ b/assets/data/characters/beidou/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/beidou/fr.json b/assets/data/characters/beidou/fr.json
index f96c0e503..eef887478 100644
--- a/assets/data/characters/beidou/fr.json
+++ b/assets/data/characters/beidou/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/beidou/jp.json b/assets/data/characters/beidou/jp.json
index 016922402..1a11d9f5e 100644
--- a/assets/data/characters/beidou/jp.json
+++ b/assets/data/characters/beidou/jp.json
@@ -176,6 +176,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/bennett/en.json b/assets/data/characters/bennett/en.json
index a5c3fa450..0349f9d4c 100644
--- a/assets/data/characters/bennett/en.json
+++ b/assets/data/characters/bennett/en.json
@@ -174,6 +174,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "SWORD"
+  "visionKey": "PYRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/bennett/es.json b/assets/data/characters/bennett/es.json
index 4e069fff2..7845cee5d 100644
--- a/assets/data/characters/bennett/es.json
+++ b/assets/data/characters/bennett/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "SWORD"
+  "visionKey": "PYRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/bennett/fr.json b/assets/data/characters/bennett/fr.json
index 30af346f5..a8976d1e0 100644
--- a/assets/data/characters/bennett/fr.json
+++ b/assets/data/characters/bennett/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "SWORD"
+  "visionKey": "PYRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/bennett/jp.json b/assets/data/characters/bennett/jp.json
index 64b1ff00e..d5674b9ea 100644
--- a/assets/data/characters/bennett/jp.json
+++ b/assets/data/characters/bennett/jp.json
@@ -172,6 +172,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "SWORD"
+  "visionKey": "PYRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/candace/en.json b/assets/data/characters/candace/en.json
index 1a70a5b6c..966d34a73 100644
--- a/assets/data/characters/candace/en.json
+++ b/assets/data/characters/candace/en.json
@@ -174,6 +174,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "HYDRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/candace/ru.json b/assets/data/characters/candace/ru.json
index 28756c4c3..4386bfd29 100644
--- a/assets/data/characters/candace/ru.json
+++ b/assets/data/characters/candace/ru.json
@@ -173,6 +173,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "HYDRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/charlotte/en.json b/assets/data/characters/charlotte/en.json
index 85c6ce191..9f895dce9 100644
--- a/assets/data/characters/charlotte/en.json
+++ b/assets/data/characters/charlotte/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CATALYST"
+  "visionKey": "CRYO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/chevreuse/en.json b/assets/data/characters/chevreuse/en.json
index 81043f79f..d04660a5e 100644
--- a/assets/data/characters/chevreuse/en.json
+++ b/assets/data/characters/chevreuse/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
\ No newline at end of file
diff --git a/assets/data/characters/chiori/en.json b/assets/data/characters/chiori/en.json
index f3c4b1052..042c911ee 100644
--- a/assets/data/characters/chiori/en.json
+++ b/assets/data/characters/chiori/en.json
@@ -159,6 +159,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/chongyun/en.json b/assets/data/characters/chongyun/en.json
index d82c96fac..6ad0809c0 100644
--- a/assets/data/characters/chongyun/en.json
+++ b/assets/data/characters/chongyun/en.json
@@ -162,6 +162,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/chongyun/es.json b/assets/data/characters/chongyun/es.json
index 480081e60..b9a57de01 100644
--- a/assets/data/characters/chongyun/es.json
+++ b/assets/data/characters/chongyun/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/chongyun/fr.json b/assets/data/characters/chongyun/fr.json
index 07ad490ad..1f66b27e7 100644
--- a/assets/data/characters/chongyun/fr.json
+++ b/assets/data/characters/chongyun/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/chongyun/jp.json b/assets/data/characters/chongyun/jp.json
index 3a3972a72..d6bc287a7 100644
--- a/assets/data/characters/chongyun/jp.json
+++ b/assets/data/characters/chongyun/jp.json
@@ -160,6 +160,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/collei/en.json b/assets/data/characters/collei/en.json
index 6f23d9a95..ef584f701 100644
--- a/assets/data/characters/collei/en.json
+++ b/assets/data/characters/collei/en.json
@@ -154,6 +154,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "BOW"
+  "visionKey": "DENDRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/cyno/en.json b/assets/data/characters/cyno/en.json
index 6cffbc8e7..648aff9f8 100644
--- a/assets/data/characters/cyno/en.json
+++ b/assets/data/characters/cyno/en.json
@@ -190,7 +190,7 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
+  "visionKey": "ELECTRO",
   "name_key": "cyno",
-  "weapon_type": "POLEARM"
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/dehya/en.json b/assets/data/characters/dehya/en.json
index d7b7b2bb5..76dfedf6b 100644
--- a/assets/data/characters/dehya/en.json
+++ b/assets/data/characters/dehya/en.json
@@ -182,6 +182,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/diluc/en.json b/assets/data/characters/diluc/en.json
index 3f86e9435..4041145e7 100644
--- a/assets/data/characters/diluc/en.json
+++ b/assets/data/characters/diluc/en.json
@@ -174,8 +174,8 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE",
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/diluc/es.json b/assets/data/characters/diluc/es.json
index 63d516011..1916cdad5 100644
--- a/assets/data/characters/diluc/es.json
+++ b/assets/data/characters/diluc/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/diluc/fr.json b/assets/data/characters/diluc/fr.json
index 398f34c09..754793aec 100644
--- a/assets/data/characters/diluc/fr.json
+++ b/assets/data/characters/diluc/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/diluc/jp.json b/assets/data/characters/diluc/jp.json
index ec07d4427..d9e5898cb 100644
--- a/assets/data/characters/diluc/jp.json
+++ b/assets/data/characters/diluc/jp.json
@@ -172,6 +172,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/diona/en.json b/assets/data/characters/diona/en.json
index 1dcac1d8a..86ad7fdc6 100644
--- a/assets/data/characters/diona/en.json
+++ b/assets/data/characters/diona/en.json
@@ -174,6 +174,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/diona/es.json b/assets/data/characters/diona/es.json
index b8e8a58c2..4799ef91a 100644
--- a/assets/data/characters/diona/es.json
+++ b/assets/data/characters/diona/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/diona/fr.json b/assets/data/characters/diona/fr.json
index a07be932f..03d36dd59 100644
--- a/assets/data/characters/diona/fr.json
+++ b/assets/data/characters/diona/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/diona/jp.json b/assets/data/characters/diona/jp.json
index 2be7515e6..12ac561bf 100644
--- a/assets/data/characters/diona/jp.json
+++ b/assets/data/characters/diona/jp.json
@@ -172,6 +172,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/dori/en.json b/assets/data/characters/dori/en.json
index 00ecb3340..36e3f95de 100644
--- a/assets/data/characters/dori/en.json
+++ b/assets/data/characters/dori/en.json
@@ -166,6 +166,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/eula/en.json b/assets/data/characters/eula/en.json
index e7bf946a4..da2460092 100644
--- a/assets/data/characters/eula/en.json
+++ b/assets/data/characters/eula/en.json
@@ -202,6 +202,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/eula/es.json b/assets/data/characters/eula/es.json
index ccc37e113..791329313 100644
--- a/assets/data/characters/eula/es.json
+++ b/assets/data/characters/eula/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/eula/fr.json b/assets/data/characters/eula/fr.json
index cfb5fb228..0469ae738 100644
--- a/assets/data/characters/eula/fr.json
+++ b/assets/data/characters/eula/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/eula/jp.json b/assets/data/characters/eula/jp.json
index 940b4eb02..fa6bbf6bb 100644
--- a/assets/data/characters/eula/jp.json
+++ b/assets/data/characters/eula/jp.json
@@ -196,6 +196,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/faruzan/en.json b/assets/data/characters/faruzan/en.json
index fb7feadbd..17ece84c0 100644
--- a/assets/data/characters/faruzan/en.json
+++ b/assets/data/characters/faruzan/en.json
@@ -174,6 +174,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "BOW"
+  "visionKey": "ANEMO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/fischl/en.json b/assets/data/characters/fischl/en.json
index 852730936..28315ea8e 100644
--- a/assets/data/characters/fischl/en.json
+++ b/assets/data/characters/fischl/en.json
@@ -158,8 +158,8 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "BOW",
+  "visionKey": "ELECTRO",
+  "weaponType": "BOW",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/fischl/es.json b/assets/data/characters/fischl/es.json
index e42d36342..7b345618c 100644
--- a/assets/data/characters/fischl/es.json
+++ b/assets/data/characters/fischl/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "BOW"
+  "visionKey": "ELECTRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/fischl/fr.json b/assets/data/characters/fischl/fr.json
index 03687a7ac..858d9cc7c 100644
--- a/assets/data/characters/fischl/fr.json
+++ b/assets/data/characters/fischl/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "BOW"
+  "visionKey": "ELECTRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/fischl/jp.json b/assets/data/characters/fischl/jp.json
index a260b2c27..3d874a90f 100644
--- a/assets/data/characters/fischl/jp.json
+++ b/assets/data/characters/fischl/jp.json
@@ -156,6 +156,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "BOW"
+  "visionKey": "ELECTRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/freminet/en.json b/assets/data/characters/freminet/en.json
index 06877aa5a..5da96e9d2 100644
--- a/assets/data/characters/freminet/en.json
+++ b/assets/data/characters/freminet/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "CRYO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/furina/en.json b/assets/data/characters/furina/en.json
index dfa73ee35..0a36b46bf 100644
--- a/assets/data/characters/furina/en.json
+++ b/assets/data/characters/furina/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/gaming/en.json b/assets/data/characters/gaming/en.json
index b1d0f0cd3..477a62f12 100644
--- a/assets/data/characters/gaming/en.json
+++ b/assets/data/characters/gaming/en.json
@@ -166,6 +166,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/ganyu/en.json b/assets/data/characters/ganyu/en.json
index be1f5d0c7..15e397a3b 100644
--- a/assets/data/characters/ganyu/en.json
+++ b/assets/data/characters/ganyu/en.json
@@ -178,8 +178,8 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW",
+  "visionKey": "CRYO",
+  "weaponType": "BOW",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/ganyu/es.json b/assets/data/characters/ganyu/es.json
index 02fbed2ff..3dff65909 100644
--- a/assets/data/characters/ganyu/es.json
+++ b/assets/data/characters/ganyu/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/ganyu/fr.json b/assets/data/characters/ganyu/fr.json
index 9623183e9..19a3f778a 100644
--- a/assets/data/characters/ganyu/fr.json
+++ b/assets/data/characters/ganyu/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/ganyu/jp.json b/assets/data/characters/ganyu/jp.json
index 97e067386..36275f662 100644
--- a/assets/data/characters/ganyu/jp.json
+++ b/assets/data/characters/ganyu/jp.json
@@ -172,6 +172,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "BOW"
+  "visionKey": "CRYO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/gorou/en.json b/assets/data/characters/gorou/en.json
index efc61193a..932d043bb 100644
--- a/assets/data/characters/gorou/en.json
+++ b/assets/data/characters/gorou/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "BOW"
+  "visionKey": "GEO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/gorou/fr.json b/assets/data/characters/gorou/fr.json
index 7faf14b36..e04809be9 100644
--- a/assets/data/characters/gorou/fr.json
+++ b/assets/data/characters/gorou/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "BOW"
+  "visionKey": "GEO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/hu-tao/en.json b/assets/data/characters/hu-tao/en.json
index b9a4a442e..f2c9616bb 100644
--- a/assets/data/characters/hu-tao/en.json
+++ b/assets/data/characters/hu-tao/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/hu-tao/es.json b/assets/data/characters/hu-tao/es.json
index 08f60a6ac..e1030a4bc 100644
--- a/assets/data/characters/hu-tao/es.json
+++ b/assets/data/characters/hu-tao/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/hu-tao/fr.json b/assets/data/characters/hu-tao/fr.json
index 295a074f1..6473d0a14 100644
--- a/assets/data/characters/hu-tao/fr.json
+++ b/assets/data/characters/hu-tao/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/hu-tao/jp.json b/assets/data/characters/hu-tao/jp.json
index 58acdd350..d9840c67b 100644
--- a/assets/data/characters/hu-tao/jp.json
+++ b/assets/data/characters/hu-tao/jp.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/hu-tao/ru.json b/assets/data/characters/hu-tao/ru.json
index 56ca58d79..530ae95bd 100644
--- a/assets/data/characters/hu-tao/ru.json
+++ b/assets/data/characters/hu-tao/ru.json
@@ -87,6 +87,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/jean/en.json b/assets/data/characters/jean/en.json
index ff410330a..74932d471 100644
--- a/assets/data/characters/jean/en.json
+++ b/assets/data/characters/jean/en.json
@@ -170,8 +170,8 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD",
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Summer",
diff --git a/assets/data/characters/jean/es.json b/assets/data/characters/jean/es.json
index 5dc159948..3efcca77c 100644
--- a/assets/data/characters/jean/es.json
+++ b/assets/data/characters/jean/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/jean/fr.json b/assets/data/characters/jean/fr.json
index d1a2fe758..ef459f024 100644
--- a/assets/data/characters/jean/fr.json
+++ b/assets/data/characters/jean/fr.json
@@ -88,8 +88,8 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD",
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Été",
diff --git a/assets/data/characters/jean/jp.json b/assets/data/characters/jean/jp.json
index f038af5c2..246e5c4f7 100644
--- a/assets/data/characters/jean/jp.json
+++ b/assets/data/characters/jean/jp.json
@@ -168,6 +168,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/kaeya/en.json b/assets/data/characters/kaeya/en.json
index 2b8d642e2..beffaf4af 100644
--- a/assets/data/characters/kaeya/en.json
+++ b/assets/data/characters/kaeya/en.json
@@ -154,8 +154,8 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD",
+  "visionKey": "CRYO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/kaeya/es.json b/assets/data/characters/kaeya/es.json
index 44286b7b3..27e20e8c0 100644
--- a/assets/data/characters/kaeya/es.json
+++ b/assets/data/characters/kaeya/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/kaeya/fr.json b/assets/data/characters/kaeya/fr.json
index b79276970..f470beefb 100644
--- a/assets/data/characters/kaeya/fr.json
+++ b/assets/data/characters/kaeya/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/kaeya/jp.json b/assets/data/characters/kaeya/jp.json
index 5d95318cd..44b0d2ba1 100644
--- a/assets/data/characters/kaeya/jp.json
+++ b/assets/data/characters/kaeya/jp.json
@@ -152,6 +152,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/kaveh/en.json b/assets/data/characters/kaveh/en.json
index b09980bea..5b8e29cc3 100644
--- a/assets/data/characters/kaveh/en.json
+++ b/assets/data/characters/kaveh/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "DENDRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/kazuha/en.json b/assets/data/characters/kazuha/en.json
index c06f127ce..6db78bdc5 100644
--- a/assets/data/characters/kazuha/en.json
+++ b/assets/data/characters/kazuha/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/kazuha/es.json b/assets/data/characters/kazuha/es.json
index 8c09b2eff..255694027 100644
--- a/assets/data/characters/kazuha/es.json
+++ b/assets/data/characters/kazuha/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/kazuha/fr.json b/assets/data/characters/kazuha/fr.json
index 0d0e495ae..f721ab242 100644
--- a/assets/data/characters/kazuha/fr.json
+++ b/assets/data/characters/kazuha/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/kazuha/jp.json b/assets/data/characters/kazuha/jp.json
index 2dffd61b4..dc2b6c1ef 100644
--- a/assets/data/characters/kazuha/jp.json
+++ b/assets/data/characters/kazuha/jp.json
@@ -168,6 +168,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/keqing/en.json b/assets/data/characters/keqing/en.json
index 7547dac6c..259a30a72 100644
--- a/assets/data/characters/keqing/en.json
+++ b/assets/data/characters/keqing/en.json
@@ -166,8 +166,8 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD",
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Formal",
diff --git a/assets/data/characters/keqing/es.json b/assets/data/characters/keqing/es.json
index 1f9e4edc9..84b1fbf0c 100644
--- a/assets/data/characters/keqing/es.json
+++ b/assets/data/characters/keqing/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD"
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/keqing/fr.json b/assets/data/characters/keqing/fr.json
index 96ca3bee5..f7a2a99d3 100644
--- a/assets/data/characters/keqing/fr.json
+++ b/assets/data/characters/keqing/fr.json
@@ -88,8 +88,8 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD",
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Formel",
diff --git a/assets/data/characters/keqing/jp.json b/assets/data/characters/keqing/jp.json
index 5ddd22cd9..193cf53ec 100644
--- a/assets/data/characters/keqing/jp.json
+++ b/assets/data/characters/keqing/jp.json
@@ -164,6 +164,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD"
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/keqing/ru.json b/assets/data/characters/keqing/ru.json
index c45ffbba9..f11af4cef 100644
--- a/assets/data/characters/keqing/ru.json
+++ b/assets/data/characters/keqing/ru.json
@@ -165,8 +165,8 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD",
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Роскошный костюм",
diff --git a/assets/data/characters/kirara/en.json b/assets/data/characters/kirara/en.json
index ebe517f84..ba6385025 100644
--- a/assets/data/characters/kirara/en.json
+++ b/assets/data/characters/kirara/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "DENDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/klee/en.json b/assets/data/characters/klee/en.json
index 2b42d0d33..154927976 100644
--- a/assets/data/characters/klee/en.json
+++ b/assets/data/characters/klee/en.json
@@ -154,8 +154,8 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST",
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/klee/es.json b/assets/data/characters/klee/es.json
index a2598c75d..40652cb88 100644
--- a/assets/data/characters/klee/es.json
+++ b/assets/data/characters/klee/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/klee/fr.json b/assets/data/characters/klee/fr.json
index 71f5b918c..f29a2b279 100644
--- a/assets/data/characters/klee/fr.json
+++ b/assets/data/characters/klee/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/klee/jp.json b/assets/data/characters/klee/jp.json
index 002f497ac..f067635a6 100644
--- a/assets/data/characters/klee/jp.json
+++ b/assets/data/characters/klee/jp.json
@@ -152,6 +152,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/kokomi/en.json b/assets/data/characters/kokomi/en.json
index 5b0cd02d3..d38c4885a 100644
--- a/assets/data/characters/kokomi/en.json
+++ b/assets/data/characters/kokomi/en.json
@@ -93,6 +93,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/kokomi/es.json b/assets/data/characters/kokomi/es.json
index a054e5ea2..70c2ef217 100644
--- a/assets/data/characters/kokomi/es.json
+++ b/assets/data/characters/kokomi/es.json
@@ -91,6 +91,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/kokomi/fr.json b/assets/data/characters/kokomi/fr.json
index c8936a522..b40c51bee 100644
--- a/assets/data/characters/kokomi/fr.json
+++ b/assets/data/characters/kokomi/fr.json
@@ -94,6 +94,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/kuki-shinobu/en.json b/assets/data/characters/kuki-shinobu/en.json
index a6a7bc208..914c666f2 100644
--- a/assets/data/characters/kuki-shinobu/en.json
+++ b/assets/data/characters/kuki-shinobu/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD"
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/layla/en.json b/assets/data/characters/layla/en.json
index 28e122f70..9ddcc024f 100644
--- a/assets/data/characters/layla/en.json
+++ b/assets/data/characters/layla/en.json
@@ -158,6 +158,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/lisa/en.json b/assets/data/characters/lisa/en.json
index dc3a7f7aa..87ae9c9a0 100644
--- a/assets/data/characters/lisa/en.json
+++ b/assets/data/characters/lisa/en.json
@@ -170,8 +170,8 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CATALYST",
+  "visionKey": "ELECTRO",
+  "weaponType": "CATALYST",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/lisa/es.json b/assets/data/characters/lisa/es.json
index 40c0d2ece..cfb759946 100644
--- a/assets/data/characters/lisa/es.json
+++ b/assets/data/characters/lisa/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ELECTRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/lisa/fr.json b/assets/data/characters/lisa/fr.json
index d9f7e63d2..32164a388 100644
--- a/assets/data/characters/lisa/fr.json
+++ b/assets/data/characters/lisa/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ELECTRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/lisa/jp.json b/assets/data/characters/lisa/jp.json
index aa049304f..79c00913b 100644
--- a/assets/data/characters/lisa/jp.json
+++ b/assets/data/characters/lisa/jp.json
@@ -168,6 +168,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ELECTRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/lynette/en.json b/assets/data/characters/lynette/en.json
index b5dc81824..f6b048d11 100644
--- a/assets/data/characters/lynette/en.json
+++ b/assets/data/characters/lynette/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/lyney/en.json b/assets/data/characters/lyney/en.json
index 25857d577..d59162556 100644
--- a/assets/data/characters/lyney/en.json
+++ b/assets/data/characters/lyney/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/mika/en.json b/assets/data/characters/mika/en.json
index b2f5a38e8..ad3723bd1 100644
--- a/assets/data/characters/mika/en.json
+++ b/assets/data/characters/mika/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "POLEARM"
+  "visionKey": "CRYO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/mona/en.json b/assets/data/characters/mona/en.json
index 380b9ac95..f6bb36e1f 100644
--- a/assets/data/characters/mona/en.json
+++ b/assets/data/characters/mona/en.json
@@ -177,8 +177,8 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST",
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST",
   "outfits": [
     {
       "type": "Alternate",
diff --git a/assets/data/characters/mona/es.json b/assets/data/characters/mona/es.json
index 8abc27dbd..9e765a56c 100644
--- a/assets/data/characters/mona/es.json
+++ b/assets/data/characters/mona/es.json
@@ -91,6 +91,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/mona/fr.json b/assets/data/characters/mona/fr.json
index 95f23a54b..54923caa7 100644
--- a/assets/data/characters/mona/fr.json
+++ b/assets/data/characters/mona/fr.json
@@ -93,6 +93,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/mona/jp.json b/assets/data/characters/mona/jp.json
index d11c43333..8b30417f4 100644
--- a/assets/data/characters/mona/jp.json
+++ b/assets/data/characters/mona/jp.json
@@ -175,6 +175,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/nahida/en.json b/assets/data/characters/nahida/en.json
index 54d76b065..79821ba7e 100644
--- a/assets/data/characters/nahida/en.json
+++ b/assets/data/characters/nahida/en.json
@@ -166,6 +166,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "DENDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/nahida/es.json b/assets/data/characters/nahida/es.json
index 04dd99561..8c7f94db2 100644
--- a/assets/data/characters/nahida/es.json
+++ b/assets/data/characters/nahida/es.json
@@ -87,6 +87,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "DENDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/navia/en.json b/assets/data/characters/navia/en.json
index 08b2c3015..c645e9e57 100644
--- a/assets/data/characters/navia/en.json
+++ b/assets/data/characters/navia/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "GEO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/neuvillette/en.json b/assets/data/characters/neuvillette/en.json
index d1a6cb42b..1ec00ca7e 100644
--- a/assets/data/characters/neuvillette/en.json
+++ b/assets/data/characters/neuvillette/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "HYDRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/nilou/en.json b/assets/data/characters/nilou/en.json
index 09395ef7a..b20dc3c72 100644
--- a/assets/data/characters/nilou/en.json
+++ b/assets/data/characters/nilou/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/ningguang/en.json b/assets/data/characters/ningguang/en.json
index e4fe225c0..c82a05823 100644
--- a/assets/data/characters/ningguang/en.json
+++ b/assets/data/characters/ningguang/en.json
@@ -142,8 +142,8 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CATALYST",
+  "visionKey": "GEO",
+  "weaponType": "CATALYST",
   "outfits": [
     {
       "type": "Formal",
diff --git a/assets/data/characters/ningguang/es.json b/assets/data/characters/ningguang/es.json
index c553681b8..8384431b1 100644
--- a/assets/data/characters/ningguang/es.json
+++ b/assets/data/characters/ningguang/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CATALYST"
+  "visionKey": "GEO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/ningguang/fr.json b/assets/data/characters/ningguang/fr.json
index 02b53cb4d..11f689ede 100644
--- a/assets/data/characters/ningguang/fr.json
+++ b/assets/data/characters/ningguang/fr.json
@@ -88,8 +88,8 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CATALYST",
+  "visionKey": "GEO",
+  "weaponType": "CATALYST",
   "outfits": [
     {
       "type": "Formel",
diff --git a/assets/data/characters/ningguang/jp.json b/assets/data/characters/ningguang/jp.json
index df2b04ee6..5bd969678 100644
--- a/assets/data/characters/ningguang/jp.json
+++ b/assets/data/characters/ningguang/jp.json
@@ -140,6 +140,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CATALYST"
+  "visionKey": "GEO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/noelle/en.json b/assets/data/characters/noelle/en.json
index 9b07fcea3..110d07e12 100644
--- a/assets/data/characters/noelle/en.json
+++ b/assets/data/characters/noelle/en.json
@@ -182,6 +182,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "GEO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/noelle/es.json b/assets/data/characters/noelle/es.json
index 9b59e7784..c26ed75fb 100644
--- a/assets/data/characters/noelle/es.json
+++ b/assets/data/characters/noelle/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "GEO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/noelle/fr.json b/assets/data/characters/noelle/fr.json
index 92730dbd0..fd672c86e 100644
--- a/assets/data/characters/noelle/fr.json
+++ b/assets/data/characters/noelle/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "GEO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/noelle/jp.json b/assets/data/characters/noelle/jp.json
index fca0ffa3e..8110eb945 100644
--- a/assets/data/characters/noelle/jp.json
+++ b/assets/data/characters/noelle/jp.json
@@ -180,6 +180,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "GEO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/qiqi/en.json b/assets/data/characters/qiqi/en.json
index 36cdf21c9..77b8759f5 100644
--- a/assets/data/characters/qiqi/en.json
+++ b/assets/data/characters/qiqi/en.json
@@ -174,6 +174,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/qiqi/es.json b/assets/data/characters/qiqi/es.json
index 8a03407f3..ffbf49761 100644
--- a/assets/data/characters/qiqi/es.json
+++ b/assets/data/characters/qiqi/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/qiqi/fr.json b/assets/data/characters/qiqi/fr.json
index c076ba361..9d6ee3cc8 100644
--- a/assets/data/characters/qiqi/fr.json
+++ b/assets/data/characters/qiqi/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/qiqi/jp.json b/assets/data/characters/qiqi/jp.json
index 86c684fe5..d97ce7ae0 100644
--- a/assets/data/characters/qiqi/jp.json
+++ b/assets/data/characters/qiqi/jp.json
@@ -172,6 +172,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "SWORD"
+  "visionKey": "CRYO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/raiden/en.json b/assets/data/characters/raiden/en.json
index 2cb0c4a62..7b1946700 100644
--- a/assets/data/characters/raiden/en.json
+++ b/assets/data/characters/raiden/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ELECTRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/raiden/es.json b/assets/data/characters/raiden/es.json
index a98d4406c..4a868b4d2 100644
--- a/assets/data/characters/raiden/es.json
+++ b/assets/data/characters/raiden/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ELECTRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/raiden/fr.json b/assets/data/characters/raiden/fr.json
index 9282202cc..db45e2488 100644
--- a/assets/data/characters/raiden/fr.json
+++ b/assets/data/characters/raiden/fr.json
@@ -94,6 +94,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ELECTRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/raiden/jp.json b/assets/data/characters/raiden/jp.json
index eee6ebc23..60acdadab 100644
--- a/assets/data/characters/raiden/jp.json
+++ b/assets/data/characters/raiden/jp.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ELECTRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/razor/en.json b/assets/data/characters/razor/en.json
index c0062c66f..197772240 100644
--- a/assets/data/characters/razor/en.json
+++ b/assets/data/characters/razor/en.json
@@ -190,6 +190,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/razor/es.json b/assets/data/characters/razor/es.json
index 74efa1330..8bd508f15 100644
--- a/assets/data/characters/razor/es.json
+++ b/assets/data/characters/razor/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/razor/fr.json b/assets/data/characters/razor/fr.json
index 229a25524..a0e4f9e40 100644
--- a/assets/data/characters/razor/fr.json
+++ b/assets/data/characters/razor/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/razor/jp.json b/assets/data/characters/razor/jp.json
index b1f4dabba..a2efa4c6f 100644
--- a/assets/data/characters/razor/jp.json
+++ b/assets/data/characters/razor/jp.json
@@ -188,6 +188,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ELECTRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/rosaria/en.json b/assets/data/characters/rosaria/en.json
index fce1469df..beb9ac695 100644
--- a/assets/data/characters/rosaria/en.json
+++ b/assets/data/characters/rosaria/en.json
@@ -158,8 +158,8 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "POLEARM",
+  "visionKey": "CRYO",
+  "weaponType": "POLEARM",
   "outfits": [
     {
       "type": "Alternate",
diff --git a/assets/data/characters/rosaria/es.json b/assets/data/characters/rosaria/es.json
index 75958275f..e6b2af5c5 100644
--- a/assets/data/characters/rosaria/es.json
+++ b/assets/data/characters/rosaria/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "POLEARM"
+  "visionKey": "CRYO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/rosaria/fr.json b/assets/data/characters/rosaria/fr.json
index a0fa19874..373390b5d 100644
--- a/assets/data/characters/rosaria/fr.json
+++ b/assets/data/characters/rosaria/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "POLEARM"
+  "visionKey": "CRYO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/rosaria/jp.json b/assets/data/characters/rosaria/jp.json
index 1a4a66436..686bded3c 100644
--- a/assets/data/characters/rosaria/jp.json
+++ b/assets/data/characters/rosaria/jp.json
@@ -156,6 +156,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "POLEARM"
+  "visionKey": "CRYO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/sara/en.json b/assets/data/characters/sara/en.json
index f47a835b7..9a9f3a971 100644
--- a/assets/data/characters/sara/en.json
+++ b/assets/data/characters/sara/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "BOW"
+  "visionKey": "ELECTRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/sara/es.json b/assets/data/characters/sara/es.json
index 335b5ce21..134a00e61 100644
--- a/assets/data/characters/sara/es.json
+++ b/assets/data/characters/sara/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "BOW"
+  "visionKey": "ELECTRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/sara/fr.json b/assets/data/characters/sara/fr.json
index c586eb209..c6ceb0165 100644
--- a/assets/data/characters/sara/fr.json
+++ b/assets/data/characters/sara/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "BOW"
+  "visionKey": "ELECTRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/sayu/en.json b/assets/data/characters/sayu/en.json
index 657252e58..5b8c5ba58 100644
--- a/assets/data/characters/sayu/en.json
+++ b/assets/data/characters/sayu/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ANEMO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/sayu/es.json b/assets/data/characters/sayu/es.json
index 55ff05dfc..b56582926 100644
--- a/assets/data/characters/sayu/es.json
+++ b/assets/data/characters/sayu/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ANEMO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/sayu/fr.json b/assets/data/characters/sayu/fr.json
index e3c76d41b..64a356580 100644
--- a/assets/data/characters/sayu/fr.json
+++ b/assets/data/characters/sayu/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "ANEMO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/shenhe/en.json b/assets/data/characters/shenhe/en.json
index de9b8bb0c..0b77bead4 100644
--- a/assets/data/characters/shenhe/en.json
+++ b/assets/data/characters/shenhe/en.json
@@ -88,8 +88,8 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "POLEARM",
+  "visionKey": "CRYO",
+  "weaponType": "POLEARM",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/shenhe/fr.json b/assets/data/characters/shenhe/fr.json
index bce3fcb89..4d225f584 100644
--- a/assets/data/characters/shenhe/fr.json
+++ b/assets/data/characters/shenhe/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "POLEARM"
+  "visionKey": "CRYO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/shikanoin-heizou/en.json b/assets/data/characters/shikanoin-heizou/en.json
index c333805eb..c24a9dd47 100644
--- a/assets/data/characters/shikanoin-heizou/en.json
+++ b/assets/data/characters/shikanoin-heizou/en.json
@@ -166,6 +166,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ANEMO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/sucrose/en.json b/assets/data/characters/sucrose/en.json
index 64ed2b0b7..1343627ad 100644
--- a/assets/data/characters/sucrose/en.json
+++ b/assets/data/characters/sucrose/en.json
@@ -154,6 +154,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ANEMO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/sucrose/es.json b/assets/data/characters/sucrose/es.json
index a28cd946e..2807788d8 100644
--- a/assets/data/characters/sucrose/es.json
+++ b/assets/data/characters/sucrose/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ANEMO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/sucrose/fr.json b/assets/data/characters/sucrose/fr.json
index a66b84731..46b501164 100644
--- a/assets/data/characters/sucrose/fr.json
+++ b/assets/data/characters/sucrose/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ANEMO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/sucrose/jp.json b/assets/data/characters/sucrose/jp.json
index 1443fdbc4..472d7f3c0 100644
--- a/assets/data/characters/sucrose/jp.json
+++ b/assets/data/characters/sucrose/jp.json
@@ -152,6 +152,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ANEMO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/tartaglia/en.json b/assets/data/characters/tartaglia/en.json
index 452d530f9..5a9880467 100644
--- a/assets/data/characters/tartaglia/en.json
+++ b/assets/data/characters/tartaglia/en.json
@@ -222,6 +222,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "BOW"
+  "visionKey": "HYDRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/tartaglia/es.json b/assets/data/characters/tartaglia/es.json
index d3f33387f..e99f0f03f 100644
--- a/assets/data/characters/tartaglia/es.json
+++ b/assets/data/characters/tartaglia/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "BOW"
+  "visionKey": "HYDRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/tartaglia/fr.json b/assets/data/characters/tartaglia/fr.json
index d221f239a..77f4e381a 100644
--- a/assets/data/characters/tartaglia/fr.json
+++ b/assets/data/characters/tartaglia/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "BOW"
+  "visionKey": "HYDRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/tartaglia/jp.json b/assets/data/characters/tartaglia/jp.json
index d7d7be151..79a5c2483 100644
--- a/assets/data/characters/tartaglia/jp.json
+++ b/assets/data/characters/tartaglia/jp.json
@@ -220,6 +220,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "BOW"
+  "visionKey": "HYDRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/thoma/en.json b/assets/data/characters/thoma/en.json
index 7b53af0c5..3a85a7687 100644
--- a/assets/data/characters/thoma/en.json
+++ b/assets/data/characters/thoma/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/thoma/fr.json b/assets/data/characters/thoma/fr.json
index 93b54623e..8c9b38cec 100644
--- a/assets/data/characters/thoma/fr.json
+++ b/assets/data/characters/thoma/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/tighnari/en.json b/assets/data/characters/tighnari/en.json
index 0c562a423..0f79fac68 100644
--- a/assets/data/characters/tighnari/en.json
+++ b/assets/data/characters/tighnari/en.json
@@ -166,6 +166,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "BOW"
+  "visionKey": "DENDRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/traveler-anemo/en.json b/assets/data/characters/traveler-anemo/en.json
index 89f2cbb95..4c89e61e9 100644
--- a/assets/data/characters/traveler-anemo/en.json
+++ b/assets/data/characters/traveler-anemo/en.json
@@ -163,6 +163,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-anemo/es.json b/assets/data/characters/traveler-anemo/es.json
index 584f2f746..ea0a82470 100644
--- a/assets/data/characters/traveler-anemo/es.json
+++ b/assets/data/characters/traveler-anemo/es.json
@@ -78,6 +78,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-anemo/fr.json b/assets/data/characters/traveler-anemo/fr.json
index 42d6d8095..ffd99357d 100644
--- a/assets/data/characters/traveler-anemo/fr.json
+++ b/assets/data/characters/traveler-anemo/fr.json
@@ -80,6 +80,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-anemo/jp.json b/assets/data/characters/traveler-anemo/jp.json
index 3fdd8ceb2..ed428976a 100644
--- a/assets/data/characters/traveler-anemo/jp.json
+++ b/assets/data/characters/traveler-anemo/jp.json
@@ -160,6 +160,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "SWORD"
+  "visionKey": "ANEMO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-dendro/en.json b/assets/data/characters/traveler-dendro/en.json
index 4f87e56b0..92993197d 100644
--- a/assets/data/characters/traveler-dendro/en.json
+++ b/assets/data/characters/traveler-dendro/en.json
@@ -151,6 +151,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "DENDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-electro/en.json b/assets/data/characters/traveler-electro/en.json
index ba6149024..c7e25087d 100644
--- a/assets/data/characters/traveler-electro/en.json
+++ b/assets/data/characters/traveler-electro/en.json
@@ -171,6 +171,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD"
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-electro/es.json b/assets/data/characters/traveler-electro/es.json
index 190877ddd..cd9baae8c 100644
--- a/assets/data/characters/traveler-electro/es.json
+++ b/assets/data/characters/traveler-electro/es.json
@@ -78,6 +78,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD"
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-electro/fr.json b/assets/data/characters/traveler-electro/fr.json
index 69c14263a..91cdfd2a8 100644
--- a/assets/data/characters/traveler-electro/fr.json
+++ b/assets/data/characters/traveler-electro/fr.json
@@ -80,6 +80,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "SWORD"
+  "visionKey": "ELECTRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-geo/en.json b/assets/data/characters/traveler-geo/en.json
index c49988f91..c2b902c0a 100644
--- a/assets/data/characters/traveler-geo/en.json
+++ b/assets/data/characters/traveler-geo/en.json
@@ -151,6 +151,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-geo/es.json b/assets/data/characters/traveler-geo/es.json
index e896a0bb9..cb2bb6cf4 100644
--- a/assets/data/characters/traveler-geo/es.json
+++ b/assets/data/characters/traveler-geo/es.json
@@ -78,6 +78,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-geo/fr.json b/assets/data/characters/traveler-geo/fr.json
index e59ff94d8..8b83c69be 100644
--- a/assets/data/characters/traveler-geo/fr.json
+++ b/assets/data/characters/traveler-geo/fr.json
@@ -80,6 +80,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-geo/jp.json b/assets/data/characters/traveler-geo/jp.json
index 6bd64639a..2f5a58d1c 100644
--- a/assets/data/characters/traveler-geo/jp.json
+++ b/assets/data/characters/traveler-geo/jp.json
@@ -148,6 +148,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "SWORD"
+  "visionKey": "GEO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/traveler-hydro/en.json b/assets/data/characters/traveler-hydro/en.json
index 4ad83e46e..cc7f9582d 100644
--- a/assets/data/characters/traveler-hydro/en.json
+++ b/assets/data/characters/traveler-hydro/en.json
@@ -81,6 +81,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/venti/en.json b/assets/data/characters/venti/en.json
index 42498828c..3a02a9b13 100644
--- a/assets/data/characters/venti/en.json
+++ b/assets/data/characters/venti/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "BOW"
+  "visionKey": "ANEMO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/venti/es.json b/assets/data/characters/venti/es.json
index d5c7006e6..fa10fc0d9 100644
--- a/assets/data/characters/venti/es.json
+++ b/assets/data/characters/venti/es.json
@@ -168,6 +168,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "BOW"
+  "visionKey": "ANEMO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/venti/fr.json b/assets/data/characters/venti/fr.json
index c3b26481d..6c0496f97 100644
--- a/assets/data/characters/venti/fr.json
+++ b/assets/data/characters/venti/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "BOW"
+  "visionKey": "ANEMO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/venti/jp.json b/assets/data/characters/venti/jp.json
index 17ed995dd..463661a70 100644
--- a/assets/data/characters/venti/jp.json
+++ b/assets/data/characters/venti/jp.json
@@ -168,6 +168,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "BOW"
+  "visionKey": "ANEMO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/wanderer/en.json b/assets/data/characters/wanderer/en.json
index ac77c67d2..6a858ddd3 100644
--- a/assets/data/characters/wanderer/en.json
+++ b/assets/data/characters/wanderer/en.json
@@ -154,6 +154,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ANEMO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/wriothesley/en.json b/assets/data/characters/wriothesley/en.json
index b328c094b..4a5900ca5 100644
--- a/assets/data/characters/wriothesley/en.json
+++ b/assets/data/characters/wriothesley/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "CRYO",
-  "weapon_type": "CATALYST"
+  "visionKey": "CRYO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/xiangling/de.json b/assets/data/characters/xiangling/de.json
index 88ed45847..af44e3179 100644
--- a/assets/data/characters/xiangling/de.json
+++ b/assets/data/characters/xiangling/de.json
@@ -164,6 +164,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiangling/en.json b/assets/data/characters/xiangling/en.json
index dfb12f246..d64f7da11 100644
--- a/assets/data/characters/xiangling/en.json
+++ b/assets/data/characters/xiangling/en.json
@@ -166,6 +166,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiangling/es.json b/assets/data/characters/xiangling/es.json
index 75f2dd3c5..1859c9365 100644
--- a/assets/data/characters/xiangling/es.json
+++ b/assets/data/characters/xiangling/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiangling/fr.json b/assets/data/characters/xiangling/fr.json
index 120f75da2..7e9cbd448 100644
--- a/assets/data/characters/xiangling/fr.json
+++ b/assets/data/characters/xiangling/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiangling/jp.json b/assets/data/characters/xiangling/jp.json
index d53b24ddb..36a3275b3 100644
--- a/assets/data/characters/xiangling/jp.json
+++ b/assets/data/characters/xiangling/jp.json
@@ -164,6 +164,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "PYRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xianyun/en.json b/assets/data/characters/xianyun/en.json
index aed9cdc11..b2236b0f6 100644
--- a/assets/data/characters/xianyun/en.json
+++ b/assets/data/characters/xianyun/en.json
@@ -174,6 +174,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ANEMO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/xiao/de.json b/assets/data/characters/xiao/de.json
index 77a9025b4..de3a4bcc6 100644
--- a/assets/data/characters/xiao/de.json
+++ b/assets/data/characters/xiao/de.json
@@ -156,6 +156,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ANEMO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiao/en.json b/assets/data/characters/xiao/en.json
index 9cedec39f..2dc57edb1 100644
--- a/assets/data/characters/xiao/en.json
+++ b/assets/data/characters/xiao/en.json
@@ -154,6 +154,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ANEMO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiao/es.json b/assets/data/characters/xiao/es.json
index 7db563b8c..bb580ad0e 100644
--- a/assets/data/characters/xiao/es.json
+++ b/assets/data/characters/xiao/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ANEMO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiao/fr.json b/assets/data/characters/xiao/fr.json
index 56ae211a9..6292a3b7d 100644
--- a/assets/data/characters/xiao/fr.json
+++ b/assets/data/characters/xiao/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ANEMO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xiao/jp.json b/assets/data/characters/xiao/jp.json
index 6f75f3081..d5f5b22c1 100644
--- a/assets/data/characters/xiao/jp.json
+++ b/assets/data/characters/xiao/jp.json
@@ -152,6 +152,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ANEMO",
-  "weapon_type": "POLEARM"
+  "visionKey": "ANEMO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/xingqiu/de.json b/assets/data/characters/xingqiu/de.json
index dc8451d91..3befa0158 100644
--- a/assets/data/characters/xingqiu/de.json
+++ b/assets/data/characters/xingqiu/de.json
@@ -160,6 +160,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/xingqiu/en.json b/assets/data/characters/xingqiu/en.json
index d1a25c30a..c88834da0 100644
--- a/assets/data/characters/xingqiu/en.json
+++ b/assets/data/characters/xingqiu/en.json
@@ -162,8 +162,8 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD",
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD",
   "outfits": [
     {
       "type": "Themed",
diff --git a/assets/data/characters/xingqiu/es.json b/assets/data/characters/xingqiu/es.json
index 0bf907d70..efe164cc3 100644
--- a/assets/data/characters/xingqiu/es.json
+++ b/assets/data/characters/xingqiu/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/xingqiu/fr.json b/assets/data/characters/xingqiu/fr.json
index d23c46d66..a4a8e2517 100644
--- a/assets/data/characters/xingqiu/fr.json
+++ b/assets/data/characters/xingqiu/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/xingqiu/jp.json b/assets/data/characters/xingqiu/jp.json
index 86ee1b9c3..8bcbbfab4 100644
--- a/assets/data/characters/xingqiu/jp.json
+++ b/assets/data/characters/xingqiu/jp.json
@@ -160,6 +160,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "SWORD"
+  "visionKey": "HYDRO",
+  "weaponType": "SWORD"
 }
diff --git a/assets/data/characters/xinyan/de.json b/assets/data/characters/xinyan/de.json
index 40dd30c86..b638892e4 100644
--- a/assets/data/characters/xinyan/de.json
+++ b/assets/data/characters/xinyan/de.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/xinyan/en.json b/assets/data/characters/xinyan/en.json
index 33cf1ce92..3ab83d76a 100644
--- a/assets/data/characters/xinyan/en.json
+++ b/assets/data/characters/xinyan/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/xinyan/es.json b/assets/data/characters/xinyan/es.json
index f2af0d803..6817f9c34 100644
--- a/assets/data/characters/xinyan/es.json
+++ b/assets/data/characters/xinyan/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/xinyan/fr.json b/assets/data/characters/xinyan/fr.json
index 44022c8d1..6a0f17a77 100644
--- a/assets/data/characters/xinyan/fr.json
+++ b/assets/data/characters/xinyan/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/xinyan/jp.json b/assets/data/characters/xinyan/jp.json
index 56d42903a..0074c210b 100644
--- a/assets/data/characters/xinyan/jp.json
+++ b/assets/data/characters/xinyan/jp.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CLAYMORE"
+  "visionKey": "PYRO",
+  "weaponType": "CLAYMORE"
 }
diff --git a/assets/data/characters/yae-miko/en.json b/assets/data/characters/yae-miko/en.json
index 924d6e2d5..aedc51568 100644
--- a/assets/data/characters/yae-miko/en.json
+++ b/assets/data/characters/yae-miko/en.json
@@ -162,6 +162,6 @@
       "level": 6
     }
   ],
-  "vision_key": "ELECTRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "ELECTRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/yanfei/de.json b/assets/data/characters/yanfei/de.json
index dbb275ede..c07544d81 100644
--- a/assets/data/characters/yanfei/de.json
+++ b/assets/data/characters/yanfei/de.json
@@ -160,6 +160,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/yanfei/en.json b/assets/data/characters/yanfei/en.json
index 7a2032716..f5fdb25ae 100644
--- a/assets/data/characters/yanfei/en.json
+++ b/assets/data/characters/yanfei/en.json
@@ -150,6 +150,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/yanfei/es.json b/assets/data/characters/yanfei/es.json
index a941eab57..1af93e647 100644
--- a/assets/data/characters/yanfei/es.json
+++ b/assets/data/characters/yanfei/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/yanfei/fr.json b/assets/data/characters/yanfei/fr.json
index 335223a34..505d65e3c 100644
--- a/assets/data/characters/yanfei/fr.json
+++ b/assets/data/characters/yanfei/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/yanfei/jp.json b/assets/data/characters/yanfei/jp.json
index 16da54ad0..cd26d1b07 100644
--- a/assets/data/characters/yanfei/jp.json
+++ b/assets/data/characters/yanfei/jp.json
@@ -160,6 +160,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "CATALYST"
+  "visionKey": "PYRO",
+  "weaponType": "CATALYST"
 }
diff --git a/assets/data/characters/yaoyao/en.json b/assets/data/characters/yaoyao/en.json
index 0706eaa9e..bd6929879 100644
--- a/assets/data/characters/yaoyao/en.json
+++ b/assets/data/characters/yaoyao/en.json
@@ -174,6 +174,6 @@
       "level": 6
     }
   ],
-  "vision_key": "DENDRO",
-  "weapon_type": "POLEARM"
+  "visionKey": "DENDRO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/yelan/en.json b/assets/data/characters/yelan/en.json
index 877392d37..beb36aa94 100644
--- a/assets/data/characters/yelan/en.json
+++ b/assets/data/characters/yelan/en.json
@@ -162,6 +162,6 @@
       "level": 6
     }
   ],
-  "vision_key": "HYDRO",
-  "weapon_type": "BOW"
+  "visionKey": "HYDRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/yoimiya/de.json b/assets/data/characters/yoimiya/de.json
index 7bea5614e..26d18f7f9 100644
--- a/assets/data/characters/yoimiya/de.json
+++ b/assets/data/characters/yoimiya/de.json
@@ -160,6 +160,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/yoimiya/en.json b/assets/data/characters/yoimiya/en.json
index a60dad7f3..473470388 100644
--- a/assets/data/characters/yoimiya/en.json
+++ b/assets/data/characters/yoimiya/en.json
@@ -162,6 +162,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/yoimiya/es.json b/assets/data/characters/yoimiya/es.json
index a98f40460..fb5bde9a4 100644
--- a/assets/data/characters/yoimiya/es.json
+++ b/assets/data/characters/yoimiya/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/yoimiya/fr.json b/assets/data/characters/yoimiya/fr.json
index f5ab9b87c..d9ec70b4c 100644
--- a/assets/data/characters/yoimiya/fr.json
+++ b/assets/data/characters/yoimiya/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "PYRO",
-  "weapon_type": "BOW"
+  "visionKey": "PYRO",
+  "weaponType": "BOW"
 }
diff --git a/assets/data/characters/yun-jin/de.json b/assets/data/characters/yun-jin/de.json
index 254a23737..204e92aab 100644
--- a/assets/data/characters/yun-jin/de.json
+++ b/assets/data/characters/yun-jin/de.json
@@ -169,6 +169,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/yun-jin/en.json b/assets/data/characters/yun-jin/en.json
index f9837efc3..f6e2e566a 100644
--- a/assets/data/characters/yun-jin/en.json
+++ b/assets/data/characters/yun-jin/en.json
@@ -170,6 +170,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/yun-jin/fr.json b/assets/data/characters/yun-jin/fr.json
index 0fe90e376..da2b37e41 100644
--- a/assets/data/characters/yun-jin/fr.json
+++ b/assets/data/characters/yun-jin/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/zhongli/de.json b/assets/data/characters/zhongli/de.json
index aa7bdbfc1..a7aba69e0 100644
--- a/assets/data/characters/zhongli/de.json
+++ b/assets/data/characters/zhongli/de.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/zhongli/en.json b/assets/data/characters/zhongli/en.json
index a9a89ed3f..e0f0df28c 100644
--- a/assets/data/characters/zhongli/en.json
+++ b/assets/data/characters/zhongli/en.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/zhongli/es.json b/assets/data/characters/zhongli/es.json
index 62e833359..10706f191 100644
--- a/assets/data/characters/zhongli/es.json
+++ b/assets/data/characters/zhongli/es.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/zhongli/fr.json b/assets/data/characters/zhongli/fr.json
index 1fcbaa1cc..a46083a66 100644
--- a/assets/data/characters/zhongli/fr.json
+++ b/assets/data/characters/zhongli/fr.json
@@ -88,6 +88,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/assets/data/characters/zhongli/jp.json b/assets/data/characters/zhongli/jp.json
index 33468752d..de18cc222 100644
--- a/assets/data/characters/zhongli/jp.json
+++ b/assets/data/characters/zhongli/jp.json
@@ -86,6 +86,6 @@
       "level": 6
     }
   ],
-  "vision_key": "GEO",
-  "weapon_type": "POLEARM"
+  "visionKey": "GEO",
+  "weaponType": "POLEARM"
 }
diff --git a/scripts/add_type_to_character.js b/scripts/add_type_to_character.js
index 7ff394f29..60e9f60f2 100644
--- a/scripts/add_type_to_character.js
+++ b/scripts/add_type_to_character.js
@@ -31,7 +31,7 @@ readDirectoryRecursiveWithFilter('', '../assets/data/characters', (file) => {
   const parsed = JSON.parse(content);
 
   if (parsed.vision) {
-    parsed.vision_key = elements[parsed.vision];
+    parsed.visionKey = elements[parsed.vision];
     const encoded = JSON.stringify(parsed, undefined, 2);
     fs.writeFileSync('../assets/data/characters' + file, encoded);
   }
diff --git a/scripts/add_weapon_type.js b/scripts/add_weapon_type.js
index 3957fed3e..fa53e2785 100644
--- a/scripts/add_weapon_type.js
+++ b/scripts/add_weapon_type.js
@@ -22,8 +22,8 @@ readDirectoryRecursiveWithFilter('', '../assets/data/characters', (file) => {
   const parsed = JSON.parse(content);
 
   if (parsed.weapon && file.endsWith('en.json')) {
-    parsed.weapon_type = parsed.weapon.toUpperCase();
-    map[parsed.name] = parsed.weapon_type;
+    parsed.weaponType = parsed.weapon.toUpperCase();
+    map[parsed.name] = parsed.weaponType;
     const encoded = JSON.stringify(parsed, undefined, 2);
     fs.writeFileSync('../assets/data/characters' + file, encoded);
   }
@@ -33,7 +33,7 @@ readDirectoryRecursiveWithFilter('', '../assets/data/characters', (file) => {
   const parsed = JSON.parse(content);
 
   if (!file.endsWith('en.json')) {
-    parsed.weapon_type = map[parsed.name];
+    parsed.weaponType = map[parsed.name];
 
     const encoded = JSON.stringify(parsed, undefined, 2);
     fs.writeFileSync('../assets/data/characters' + file, encoded);