diff --git a/data/kh/aaa_lirria/config.xml b/data/kh/kh_interfaces/config.xml
similarity index 98%
rename from data/kh/aaa_lirria/config.xml
rename to data/kh/kh_interfaces/config.xml
index 26108044..533ce564 100644
--- a/data/kh/aaa_lirria/config.xml
+++ b/data/kh/kh_interfaces/config.xml
@@ -2111,72 +2111,72 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <define id="win_priority_highest"
           value="5" />
   <!-- For bars, -1024 to +1024 "percent" values from CBarManager  -->
-  <define id="player_hp_percent"
+  <define id="player_ChaScore1_percent"
           value="UI:VARIABLES:USER:ChaScore1_RATIO" />
-  <define id="player_sta_percent"
+  <define id="player_ChaScore2_percent"
           value="UI:VARIABLES:USER:ChaScore2_RATIO" />
-  <define id="player_sap_percent"
+  <define id="player_ChaScore3_percent"
           value="UI:VARIABLES:USER:ChaScore3_RATIO" />
-  <define id="player_focus_percent"
+  <define id="player_ChaScore4_percent"
           value="UI:VARIABLES:USER:ChaScore4_RATIO" />
   <define id="player_percent_max"
           value="1024" />
   <!-- For character sheet numerical values from database -->
-  <define id="player_hp"
+  <define id="player_ChaScore1"
           value="UI:VARIABLES:USER:ChaScore1" />
   <!-- Local because sent by impulse -->
-  <define id="player_hp_max"
+  <define id="player_ChaScore1_max"
           value="SERVER:CHARACTER_INFO:SCORES0:Max" />
-  <define id="player_hp_base"
+  <define id="player_ChaScore1_base"
           value="SERVER:CHARACTER_INFO:SCORES0:Base" />
-  <define id="player_sta"
+  <define id="player_ChaScore2"
           value="UI:VARIABLES:USER:ChaScore2" />
   <!-- Local because sent by impulse -->
-  <define id="player_sta_max"
+  <define id="player_ChaScore2_max"
           value="SERVER:CHARACTER_INFO:SCORES1:Max" />
-  <define id="player_sta_base"
+  <define id="player_ChaScore2_base"
           value="SERVER:CHARACTER_INFO:SCORES1:Base" />
-  <define id="player_sap"
+  <define id="player_ChaScore3"
           value="UI:VARIABLES:USER:ChaScore3" />
   <!-- Local because sent by impulse -->
-  <define id="player_sap_max"
+  <define id="player_ChaScore3_max"
           value="SERVER:CHARACTER_INFO:SCORES2:Max" />
-  <define id="player_sap_base"
+  <define id="player_ChaScore3_base"
           value="SERVER:CHARACTER_INFO:SCORES2:Base" />
-  <define id="player_focus"
+  <define id="player_ChaScore4"
           value="UI:VARIABLES:USER:ChaScore4" />
   <!-- Local because sent by impulse -->
-  <define id="player_focus_max"
+  <define id="player_ChaScore4_max"
           value="SERVER:CHARACTER_INFO:SCORES3:Max" />
-  <define id="player_focus_base"
+  <define id="player_ChaScore4_base"
           value="SERVER:CHARACTER_INFO:SCORES3:Base" />
-  <define id="player_hpreg"
+  <define id="player_ChaScore1reg"
           value="SERVER:CHARACTER_INFO:SCORES0:Regen" />
-  <define id="player_hpreg_base"
+  <define id="player_ChaScore1reg_base"
           value="SERVER:CHARACTER_INFO:SCORES0:BaseRegen" />
-  <define id="player_stareg"
+  <define id="player_ChaScore2reg"
           value="SERVER:CHARACTER_INFO:SCORES1:Regen" />
-  <define id="player_stareg_base"
+  <define id="player_ChaScore2reg_base"
           value="SERVER:CHARACTER_INFO:SCORES1:BaseRegen" />
-  <define id="player_sapreg"
+  <define id="player_ChaScore3reg"
           value="SERVER:CHARACTER_INFO:SCORES2:Regen" />
-  <define id="player_sapreg_base"
+  <define id="player_ChaScore3reg_base"
           value="SERVER:CHARACTER_INFO:SCORES2:BaseRegen" />
-  <define id="player_focreg"
+  <define id="player_ChaScore4reg"
           value="SERVER:CHARACTER_INFO:SCORES3:Regen" />
-  <define id="player_focreg_base"
+  <define id="player_ChaScore4reg_base"
           value="SERVER:CHARACTER_INFO:SCORES3:BaseRegen" />
-  <define id="player_carac_hpmax"
+  <define id="player_carac_ChaScore1max"
           value="SERVER:CHARACTER_INFO:CHARACTERISTICS0:VALUE" />
-  <define id="player_carac_hpreg"
+  <define id="player_carac_ChaScore1reg"
           value="SERVER:CHARACTER_INFO:CHARACTERISTICS1:VALUE" />
-  <define id="player_carac_sapmax"
+  <define id="player_carac_ChaScore3max"
           value="SERVER:CHARACTER_INFO:CHARACTERISTICS2:VALUE" />
-  <define id="player_carac_sapreg"
+  <define id="player_carac_ChaScore3reg"
           value="SERVER:CHARACTER_INFO:CHARACTERISTICS3:VALUE" />
-  <define id="player_carac_stamax"
+  <define id="player_carac_ChaScore2max"
           value="SERVER:CHARACTER_INFO:CHARACTERISTICS4:VALUE" />
-  <define id="player_carac_stareg"
+  <define id="player_carac_ChaScore2reg"
           value="SERVER:CHARACTER_INFO:CHARACTERISTICS5:VALUE" />
   <define id="player_carac_wishmax"
           value="SERVER:CHARACTER_INFO:CHARACTERISTICS6:VALUE" />
@@ -3470,15 +3470,15 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <!-- ***************************** -->
   <!-- *  COMMON DEFINE COLORS     * -->
   <!-- ***************************** -->
-  <define id="hp_color"
+  <define id="ChaScore1_color"
           value="255 64 0 255" />
-  <define id="hp_color_neg"
+  <define id="ChaScore1_color_neg"
           value="127 32 0 255" />
-  <define id="sta_color"
+  <define id="ChaScore2_color"
           value="255 0 255 255" />
-  <define id="sap_color"
+  <define id="ChaScore3_color"
           value="72 255 0 255" />
-  <define id="focus_color"
+  <define id="ChaScore4_color"
           value="0 128 255 255" />
   <define id="bulk_color"
           value="215 185 75 255" />
@@ -3800,13 +3800,13 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:VARIABLES:BARS:TARGET:ChaScore4"
             type="sint32"
             value="0" />
-  <define id="target_hp"
+  <define id="target_ChaScore1"
           value="UI:VARIABLES:BARS:TARGET:ChaScore1" />
-  <define id="target_sta"
+  <define id="target_ChaScore2"
           value="UI:VARIABLES:BARS:TARGET:ChaScore2" />
-  <define id="target_sap"
+  <define id="target_ChaScore3"
           value="UI:VARIABLES:BARS:TARGET:ChaScore3" />
-  <define id="target_focus"
+  <define id="target_ChaScore4"
           value="UI:VARIABLES:BARS:TARGET:ChaScore4" />
   <!-- Special USER. -1024 to +1024 "percent" values -->
   <variable entry="UI:VARIABLES:USER:ChaScore1_RATIO"
diff --git a/data/kh/aaa_lirria/game_r2_loading.lua b/data/kh/kh_interfaces/game_r2_loading.lua
similarity index 100%
rename from data/kh/aaa_lirria/game_r2_loading.lua
rename to data/kh/kh_interfaces/game_r2_loading.lua
diff --git a/data/kh/aaa_lirria/info_player.lua b/data/kh/kh_interfaces/info_player.lua
similarity index 100%
rename from data/kh/aaa_lirria/info_player.lua
rename to data/kh/kh_interfaces/info_player.lua
diff --git a/data/kh/aaa_lirria/interaction.xml b/data/kh/kh_interfaces/interaction.xml
similarity index 99%
rename from data/kh/aaa_lirria/interaction.xml
rename to data/kh/kh_interfaces/interaction.xml
index eb2f7ea3..60ec762b 100644
--- a/data/kh/aaa_lirria/interaction.xml
+++ b/data/kh/kh_interfaces/interaction.xml
@@ -94,19 +94,19 @@
     <view type="bar3"
           id="jauges"
           posref="TR TR"
-          color1="%focus_color"
-          value1="%target_focus"
+          color1="%ChaScore4_color"
+          value1="%target_ChaScore4"
           range1="UI:CONST:127"
-          color2="%sap_color"
-          value2="%target_sap"
+          color2="%ChaScore3_color"
+          value2="%target_ChaScore3"
           range2="UI:CONST:127"
-          color3="%sta_color"
-          value3="%target_sta"
+          color3="%ChaScore2_color"
+          value3="%target_ChaScore2"
           range3="UI:CONST:127" />
     <ctrl type="tooltip"
           id="tt1"
           tooltip="uiStamina"
-          color="%sta_color"
+          color="%ChaScore2_color"
           posparent="jauges"
           posref="TL TL"
           x="0"
@@ -117,7 +117,7 @@
     <ctrl type="tooltip"
           id="tt2"
           tooltip="uiSap"
-          color="%sap_color"
+          color="%ChaScore3_color"
           posparent="tt1"
           posref="BL BL"
           x="0"
@@ -128,7 +128,7 @@
     <ctrl type="tooltip"
           id="tt3"
           tooltip="uiFocus"
-          color="%focus_color"
+          color="%ChaScore4_color"
           posparent="tt2"
           posref="BL TL"
           x="0"
diff --git a/data/kh/aaa_lirria/keys.xml b/data/kh/kh_interfaces/keys.xml
similarity index 100%
rename from data/kh/aaa_lirria/keys.xml
rename to data/kh/kh_interfaces/keys.xml
diff --git a/data/kh/aaa_lirria/keys_bi.wasd.xml b/data/kh/kh_interfaces/keys_bi.wasd.xml
similarity index 100%
rename from data/kh/aaa_lirria/keys_bi.wasd.xml
rename to data/kh/kh_interfaces/keys_bi.wasd.xml
diff --git a/data/kh/aaa_lirria/keys_bi.zqsd.xml b/data/kh/kh_interfaces/keys_bi.zqsd.xml
similarity index 100%
rename from data/kh/aaa_lirria/keys_bi.zqsd.xml
rename to data/kh/kh_interfaces/keys_bi.zqsd.xml
diff --git a/data/kh/aaa_lirria/phrase.xml b/data/kh/kh_interfaces/phrase.xml
similarity index 98%
rename from data/kh/aaa_lirria/phrase.xml
rename to data/kh/kh_interfaces/phrase.xml
index 6d802a35..98ae2260 100644
--- a/data/kh/aaa_lirria/phrase.xml
+++ b/data/kh/kh_interfaces/phrase.xml
@@ -738,11 +738,11 @@
 			-->
 			<instance template="box_widget" id="box_cost" posref="BL BL" w="81" h="13" />
 			
-			<view type="text_number" id="ChaScore1_cost" posparent="box_cost" posref="ML MM" x="14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore1_COST" color="%hp_color" global_color="false" />
+			<view type="text_number" id="ChaScore1_cost" posparent="box_cost" posref="ML MM" x="14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore1_COST" color="%ChaScore1_color" global_color="false" />
 			<view type="text" id="sep1" posparent="box_cost" posref="ML MM" x="27" y="-1" shadow="true" fontsize="10" hardtext="/" color="255 255 255 255" />
-			<view type="text_number" id="ChaScore3_cost" posparent="box_cost" posref="MM MM" x="0" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore3_COST" color="%sap_color" global_color="false" />
+			<view type="text_number" id="ChaScore3_cost" posparent="box_cost" posref="MM MM" x="0" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore3_COST" color="%ChaScore3_color" global_color="false" />
 			<view type="text" id="sep2" posparent="box_cost" posref="ML MM" x="54" y="-1" shadow="true" fontsize="10" hardtext="/" color="255 255 255 255" />
-			<view type="text_number" id="ChaScore2_cost" posparent="box_cost" posref="MR MM" x="-14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore2_COST" color="%sta_color" global_color="false" />
+			<view type="text_number" id="ChaScore2_cost" posparent="box_cost" posref="MR MM" x="-14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore2_COST" color="%ChaScore2_color" global_color="false" />
 		</group>
 		<link expr="eq(@UI:VARIABLES:LINKS_INFOS, 0)" target="name_cost:active" />	
 		
@@ -756,9 +756,9 @@
 			<view type="text_id" id="name" posref="TL TL" x="0" y="-1" h="10" shadow="true" fontsize="10" textid="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_NAME" />
 			<!-- Jauges Target -->
 			<view type="bar3" id="jauges" posref="BL BL" mini="true" y="1"
-								color1="%sta_color" 	value1="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore2"  	range1="UI:CONST:127" 
-								color2="%sap_color"   value2="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore3"	range2="UI:CONST:127"
-								color3="%hp_color"   value3="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore1" 	range3="UI:CONST:127" />
+								color1="%ChaScore2_color" 	value1="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore2"  	range1="UI:CONST:127" 
+								color2="%ChaScore3_color"   value2="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore3"	range2="UI:CONST:127"
+								color3="%ChaScore1_color"   value3="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore1" 	range3="UI:CONST:127" />
 		</group>
 		<link expr="ifthenelse(eq(@UI:VARIABLES:LINKS_INFOS, 0), 154, 40)" target="target:x" />
 		
diff --git a/data/kh/aaa_lirria/player.lua b/data/kh/kh_interfaces/player.lua
similarity index 96%
rename from data/kh/aaa_lirria/player.lua
rename to data/kh/kh_interfaces/player.lua
index dadd25e5..3e105361 100644
--- a/data/kh/aaa_lirria/player.lua
+++ b/data/kh/kh_interfaces/player.lua
@@ -66,7 +66,7 @@ function game:updatePlayerBars()
 
 	-- choose good y-position
 
-	local totalBarDisp = dispSap + dispSta + dispFoc;
+	local totalBarDisp = dispChaScore3 + dispChaScore2 + dispChaScore4;
 	if (totalBarDisp == 3) then
 
 		ui.b_ChaScore3.y = -20;
@@ -83,7 +83,7 @@ function game:updatePlayerBars()
 
 		if (dispChaScore2 == 0) then
 			ui.b_ChaScore3.y = -20;
-			ui.b_foc.y = -35;
+			ui.b_ChaScore4.y = -35;
 		end
 
 		if (dispChaScore4 == 0) then
@@ -867,7 +867,7 @@ function game:updatePhraseTooltip(phrase)
 	self:setPhraseTooltipCarac(ttWin, "ChaScore1_cost",	phrase:getChaScore1Cost())
 	self:setPhraseTooltipCarac(ttWin, "ChaScore3_cost",	phrase:getChaScore3Cost())
 	self:setPhraseTooltipCarac(ttWin, "ChaScore2_cost",	phrase:getChaScore2Cost())	
-	self:setPhraseTooltipCarac(ttWin, "ChaScore4_cost", phrase:getChascore4Cost())	
+	self:setPhraseTooltipCarac(ttWin, "ChaScore4_cost", phrase:getChaScore4Cost())	
 	self:setPhraseTooltipCarac(ttWin, "cast_time",  phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds")))
 	local castRange = phrase:getCastRange()
 	if not phrase:isMagicPhrase() then
diff --git a/data/kh/aaa_lirria/player.xml b/data/kh/kh_interfaces/player.xml
similarity index 97%
rename from data/kh/aaa_lirria/player.xml
rename to data/kh/kh_interfaces/player.xml
index 8362a13c..8ba20162 100644
--- a/data/kh/aaa_lirria/player.xml
+++ b/data/kh/kh_interfaces/player.xml
@@ -40,14 +40,14 @@
           posref="#posref"
           x="#x"
           y="#y"
-          color1="%focus_color"
-          value1="%player_focus_percent"
+          color1="%ChaScore4_color"
+          value1="%player_ChaScore4_percent"
           range1="%player_percent_max"
-          color2="%sap_color"
-          value2="%player_sap_percent"
+          color2="%ChaScore3_color"
+          value2="%player_ChaScore3_percent"
           range2="%player_percent_max"
-          color3="%sta_color"
-          value3="%player_sta_percent"
+          color3="%ChaScore2_color"
+          value3="%player_ChaScore2_percent"
           range3="%player_percent_max" />
     <ctrl type="tooltip"
           id="tt1"
@@ -63,7 +63,7 @@
     <ctrl type="tooltip"
           id="tt2"
           on_tooltip="player_tt_sap"
-          color="%sap_color"
+          color="%ChaScore3_color"
           posparent="tt1"
           posref="BL TL"
           x="0"
@@ -74,7 +74,7 @@
     <ctrl type="tooltip"
           id="tt3"
           on_tooltip="player_tt_focus"
-          color="%focus_color"
+          color="%ChaScore4_color"
           posparent="tt2"
           posref="BL TL"
           x="0"
@@ -549,71 +549,71 @@
            group_onclick_l="self_target">
       <!-- new Jauges -->
       <view type="bitmap"
-            id="b_lif"
+            id="b_ChaScore1"
             posref="TL TL"
             texture="slot_jauge.tga"
             inherit_gc_alpha="false" />
       <view type="bitmap"
-            id="b_sap"
+            id="b_ChaScore3"
             posref="TL TL"
             y="-20"
             texture="slot_jauge.tga"
             inherit_gc_alpha="false" />
       <view type="bitmap"
-            id="b_sta"
+            id="b_ChaScore2"
             posref="TL TL"
             y="-35"
             texture="slot_jauge.tga"
             inherit_gc_alpha="false" />
       <view type="bitmap"
-            id="b_foc"
+            id="b_ChaScore4"
             posref="TL TL"
             y="-50"
             texture="slot_jauge.tga"
             inherit_gc_alpha="false" />
       <instance template="jauge_score"
-                id="jlife"
-                posparent="b_lif"
+                id="jChaScore1"
+                posparent="b_ChaScore1"
                 posref="TL TL"
                 color="214 56 7 255"
                 color_gray="160 42 5 255"
                 text="uiHP"
-                val="%player_hp"
-                maxval="%player_hp_max"
-                val_bar="%player_hp_percent"
+                val="%player_ChaScore1"
+                maxval="%player_ChaScore1_max"
+                val_bar="%player_ChaScore1_percent"
                 tooltip="uittGaugesHP" />
       <instance template="jauge_score"
-                id="jsap"
-                posparent="b_sap"
+                id="jChaScore3"
+                posparent="b_ChaScore3"
                 posref="TL TL"
                 color="133 189 5 255"
                 color_gray="100 141 3 255"
                 text="uiSap"
-                val="%player_sap"
-                maxval="%player_sap_max"
-                val_bar="%player_sap_percent"
+                val="%player_ChaScore3"
+                maxval="%player_ChaScore3_max"
+                val_bar="%player_ChaScore3_percent"
                 tooltip="uittGaugesSap" />
       <instance template="jauge_score"
-                id="jsta"
-                posparent="b_sta"
+                id="jChaScore2"
+                posparent="b_ChaScore2"
                 posref="TL TL"
                 color="202 67 152 255"
                 color_gray="151 50 114 255"
                 text="uiStamina"
-                val="%player_sta"
-                maxval="%player_sta_max"
-                val_bar="%player_sta_percent"
+                val="%player_ChaScore2"
+                maxval="%player_ChaScore2_max"
+                val_bar="%player_ChaScore2_percent"
                 tooltip="uittGaugesSta" />
       <instance template="jauge_score"
-                id="jfoc"
-                posparent="b_foc"
+                id="jChaScore4"
+                posparent="b_ChaScore4"
                 posref="TL TL"
                 color="31 155 197 255"
                 color_gray="23 116 147 255"
                 text="uiFocus"
-                val="%player_focus"
-                maxval="%player_focus_max"
-                val_bar="%player_focus_percent"
+                val="%player_ChaScore4"
+                maxval="%player_ChaScore4_max"
+                val_bar="%player_ChaScore4_percent"
                 tooltip="uittGaugesFoc" />
       <!-- Action Progression (display only if user wants to). Important to set active by default, to have correct reset.xml behaviour -->
       <instance template="t_current_action_bar"
@@ -1125,7 +1125,7 @@
               color2="255 255 255 255"
               value2="#beast_db_entry:HUNGER"
               range2="31"
-              color3="%hp_color"
+              color3="%ChaScore1_color"
               value3="#bars_entry:ChaScore1"
               range3="127" />
         <ctrl type="tooltip"
diff --git a/data/kh/aaa_lirria/reset.xml b/data/kh/kh_interfaces/reset.xml
similarity index 100%
rename from data/kh/aaa_lirria/reset.xml
rename to data/kh/kh_interfaces/reset.xml
diff --git a/data/kh/kh_interfaces/widgets.xml b/data/kh/kh_interfaces/widgets.xml
index 9aa7b020..18999a80 100644
--- a/data/kh/kh_interfaces/widgets.xml
+++ b/data/kh/kh_interfaces/widgets.xml
@@ -3897,39 +3897,39 @@
           active="false"
           global_color="false"/>
     <view type="bitmap"
-          id="hp_cost"
+          id="ChaScore1_cost"
           texture="ico_heal.tga"
           global_color="false"
           posref="BL TL"
           posparent="success_rate" />
     <view type="bitmap"
-          id="sta_cost"
+          id="ChaScore2_cost"
           y="0"
           texture="ico_stamina.tga"
           global_color="false"
           posref="BL TL"
-          posparent="hp_cost" />
+          posparent="ChaScore1_cost" />
     <view type="bitmap"
-          id="sap_cost"
+          id="ChaScore3_cost"
           y="0"
           texture="ico_sap.tga"
           global_color="false"
           posref="BL TL"
-          posparent="sta_cost" />
+          posparent="ChaScore2_cost" />
     <view type="bitmap"
-          id="focus_cost"
+          id="ChaScore4_cost"
           y="0"
           texture="ico_focus.tga"
           global_color="false"
           posref="BL TL"
-          posparent="sap_cost" />
+          posparent="ChaScore3_cost" />
     <view type="bitmap"
           id="cast_time"
           y="0"
           texture="ico_time.tga"
           global_color="false"
           posref="BL TL"
-          posparent="focus_cost" />
+          posparent="ChaScore4_cost" />
     <view type="bitmap"
           id="cast_range"
           y="0"
@@ -3938,26 +3938,26 @@
           posref="BL TL"
           posparent="cast_time" />
     <view type="text"
-          id="hp_cost_text"
-          posparent="hp_cost"
+          id="ChaScore1_cost_text"
+          posparent="ChaScore1_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="sta_cost_text"
-          posparent="sta_cost"
+          id="ChaScore2_cost_text"
+          posparent="ChaScore2_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="sap_cost_text"
-          posparent="sap_cost"
+          id="ChaScore3_cost_text"
+          posparent="ChaScore3_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="focus_cost_text"
-          posparent="focus_cost"
+          id="ChaScore4_cost_text"
+          posparent="ChaScore4_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
@@ -4104,7 +4104,7 @@
           line_maxw="300"
           multi_line_maxw_only="true" />
     <view type="bitmap"
-          id="hp_buff"
+          id="ChaScore1_buff"
           h="15"
           y="0"
           texture="ico_heal.tga"
@@ -4113,47 +4113,47 @@
           posparent="text" 
           active="true"/>
     <view type="bitmap"
-          id="sta_buff"
+          id="ChaScore2_buff"
           y="0"
           texture="ico_stamina.tga"
           global_color="false"
           posref="BL TL"
-          posparent="hp_buff" />
+          posparent="ChaScore1_buff" />
     <view type="bitmap"
-          id="sap_buff"
+          id="ChaScore3_buff"
           y="0"
           texture="ico_sap.tga"
           global_color="false"
           posref="BL TL"
-          posparent="sta_buff" />
+          posparent="ChaScore2_buff" />
     <view type="bitmap"
-          id="focus_buff"
+          id="ChaScore4_buff"
           y="0"
           texture="ico_focus.tga"
           global_color="false"
           posref="BL TL"
-          posparent="sap_buff" />
+          posparent="ChaScore3_buff" />
     <view type="text"
-          id="hp_buff_text"
-          posparent="hp_buff"
+          id="ChaScore1_buff_text"
+          posparent="ChaScore1_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="sta_buff_text"
-          posparent="sta_buff"
+          id="ChaScore2_buff_text"
+          posparent="ChaScore2_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="sap_buff_text"
-          posparent="sap_buff"
+          id="ChaScore3_buff_text"
+          posparent="ChaScore3_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="focus_buff_text"
-          posparent="focus_buff"
+          id="ChaScore4_buff_text"
+          posparent="ChaScore4_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
diff --git a/data/kh/kh_server/msg.xml b/data/kh/kh_server/msg.xml
index 5fb971a1..7b30729f 100644
--- a/data/kh/kh_server/msg.xml
+++ b/data/kh/kh_server/msg.xml
@@ -173,7 +173,7 @@
           sendto="EGS"
           format="u8"
           description="the client select a new slot to defend (or none)" />
-    <leaf name="FLYING_ChaScore1_DELTA"
+    <leaf name="FLYING_HP_DELTA"
           description="add a flying text to an entity (u32 entity, u32 rgba, s16 delta)" />
     <leaf name="FLYING_TEXT_ISE"
           description="add a flying text to an entity (u32 entity, u32 rgba, u8 effect, s32 param)" />