diff --git a/inter/aus/xml/page_catalog_group_forkid.lxml b/inter/aus/xml/page_catalog_group_forkid.lxml
index c983e014..6a8b3773 100644
--- a/inter/aus/xml/page_catalog_group_forkid.lxml
+++ b/inter/aus/xml/page_catalog_group_forkid.lxml
@@ -1736,7 +1736,7 @@
 		Var PD_CODE2 = "51-03-02-0002"
 		Var PD_CODE3 = "51-03-03-0002"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -1746,7 +1746,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot COCOA"
+		Var NameLang[0][0] = "Hot CHOCOLATE"
 		Var NameLang[0][1] = "โกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -1756,7 +1756,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Gula"
-		Var NameLang[1][0] = "Iced COCOA"
+		Var NameLang[1][0] = "Iced CHOCOLATE"
 		Var NameLang[1][1] = "โกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1766,7 +1766,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Gula, Ais"
-		Var NameLang[2][0] = "COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CHOCOLATE SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้เย็นปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -1823,9 +1823,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>
@@ -2268,7 +2268,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0010"
 		; begin lang 
-		Var aliasName[0] = "STRAWCOCOA \nSMOOTHIE"
+		Var aliasName[0] = "STRAWBERRY CHOC\nMILK"
 		Var aliasDesc[0] = "Milk, Cocoa, Strawberry Syrup"
 		Var aliasName[1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var aliasDesc[1] = "นม น้ำเชื่อมสตอเบอร์รี่ \nโกโก้ และน้ำแข็ง"
@@ -2298,7 +2298,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWCOCOA SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY CHOC MILK"
 		Var NameLang[2][1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2355,9 +2355,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWCOCOA \nSMOOTHIE</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY CHOC\nMILK</LanguageSlot1>
 		<LanguageSlot2>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot2>
-		<LanguageSlot3>STRAWCOCOA \nSMOOTHIE</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY CHOC\nMILK</LanguageSlot3>
 		<LanguageSlot4>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot6>
@@ -4102,7 +4102,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0009"
 		; begin lang 
-		Var aliasName[0] = "OREO SMOOTHIE \nVOLCANO"
+		Var aliasName[0] = "OREO VOLCANO"
 		Var aliasDesc[0] = "Milk, Sugar, Oreo, Ice"
 		Var aliasName[1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "นม น้ำตาล โอริโอ้ \n"
@@ -4132,7 +4132,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "OREO SMOOTHIE VOLCANO"
+		Var NameLang[2][0] = "OREO VOLCANO"
 		Var NameLang[2][1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -4189,9 +4189,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>OREO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>OREO VOLCANO</LanguageSlot1>
 		<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>OREO VOLCANO</LanguageSlot3>
 		<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>
diff --git a/inter/aus/xml/page_catalog_group_health.lxml b/inter/aus/xml/page_catalog_group_health.lxml
index c75ecd85..220edff5 100644
--- a/inter/aus/xml/page_catalog_group_health.lxml
+++ b/inter/aus/xml/page_catalog_group_health.lxml
@@ -5717,7 +5717,7 @@
 		Var PD_CODE2 = "51-03-02-1002"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -5804,9 +5804,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>
diff --git a/inter/aus/xml/page_catalog_group_milk.lxml b/inter/aus/xml/page_catalog_group_milk.lxml
index 8c773fe6..6eb0d6b2 100644
--- a/inter/aus/xml/page_catalog_group_milk.lxml
+++ b/inter/aus/xml/page_catalog_group_milk.lxml
@@ -1195,7 +1195,7 @@
 		Var PD_CODE2 = "51-03-02-0004"
 		Var PD_CODE3 = "51-03-03-0004"
 		; begin lang 
-		Var aliasName[0] = "CARAMEL COCOA"
+		Var aliasName[0] = "CARAMEL CHOC"
 		Var aliasDesc[0] = "Cocoa, Milk,Sugar,\nCaramel Syrup"
 		Var aliasName[1] = "คาราเมลโกโก้"
 		Var aliasDesc[1] = "โกโก้ นม น้ำตาล \nน้ำเชื่อมคาราเมล"
@@ -1205,7 +1205,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot CARAMEL COCOA"
+		Var NameLang[0][0] = "Hot CARAMEL CHOC"
 		Var NameLang[0][1] = "คาราเมลโกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -1215,7 +1215,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Koko, Susu, Gula, Sirap Karamel"
-		Var NameLang[1][0] = "Iced CARAMEL COCOA"
+		Var NameLang[1][0] = "Iced CARAMEL CHOC"
 		Var NameLang[1][1] = "คาราเมลโกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1225,7 +1225,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Koko, Susu, Gula, Sirap Karamel"
-		Var NameLang[2][0] = "CARAMEL COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CARAMEL CHOC SMOOTHIE"
 		Var NameLang[2][1] = "คาราเมลโกโก้ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -1282,9 +1282,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>CARAMEL COCOA</LanguageSlot1>
+		<LanguageSlot1>CARAMEL CHOC</LanguageSlot1>
 		<LanguageSlot2>คาราเมลโกโก้</LanguageSlot2>
-		<LanguageSlot3>CARAMEL COCOA</LanguageSlot3>
+		<LanguageSlot3>CARAMEL CHOC</LanguageSlot3>
 		<LanguageSlot4>คาราเมลโกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>คาราเมลโกโก้</LanguageSlot6>
@@ -1989,7 +1989,7 @@
 		Var PD_CODE2 = "51-03-02-0002"
 		Var PD_CODE3 = "51-03-03-0002"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -1999,7 +1999,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot COCOA"
+		Var NameLang[0][0] = "Hot CHOCOLATE"
 		Var NameLang[0][1] = "โกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -2009,7 +2009,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Gula"
-		Var NameLang[1][0] = "Iced COCOA"
+		Var NameLang[1][0] = "Iced CHOCOLATE"
 		Var NameLang[1][1] = "โกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -2019,7 +2019,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Gula, Ais"
-		Var NameLang[2][0] = "COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CHOCOLATE SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้เย็นปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2076,9 +2076,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>
@@ -2255,7 +2255,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0010"
 		; begin lang 
-		Var aliasName[0] = "STRAWCOCOA \nSMOOTHIE"
+		Var aliasName[0] = "STRAWBERRY CHOC\nMILK"
 		Var aliasDesc[0] = "Milk, Cocoa, Strawberry Syrup"
 		Var aliasName[1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var aliasDesc[1] = "นม น้ำเชื่อมสตอเบอร์รี่ \nโกโก้ และน้ำแข็ง"
@@ -2285,7 +2285,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWCOCOA SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY CHOC MILK"
 		Var NameLang[2][1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2342,9 +2342,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWCOCOA \nSMOOTHIE</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY CHOC\nMILK</LanguageSlot1>
 		<LanguageSlot2>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot2>
-		<LanguageSlot3>STRAWCOCOA \nSMOOTHIE</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY CHOC\nMILK</LanguageSlot3>
 		<LanguageSlot4>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot6>
@@ -2517,7 +2517,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0011"
 		; begin lang 
-		Var aliasName[0] = "STRAWMILK \nSMOOTHIE"
+		Var aliasName[0] = "STRAWBERRY \nMILK"
 		Var aliasDesc[0] = "Milk, Strawberry Syrup"
 		Var aliasName[1] = "นมสตอเบอร์รี่ปั่น"
 		Var aliasDesc[1] = "นม น้ำเชื่อมสตอเบอร์รี่ \nและน้ำแข็ง"
@@ -2547,7 +2547,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWMILK SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY MILK"
 		Var NameLang[2][1] = "นมสตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2604,9 +2604,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWMILK \nSMOOTHIE</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY \nMILK</LanguageSlot1>
 		<LanguageSlot2>นมสตอเบอร์รี่ปั่น</LanguageSlot2>
-		<LanguageSlot3>STRAWMILK \nSMOOTHIE</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY \nMILK</LanguageSlot3>
 		<LanguageSlot4>นมสตอเบอร์รี่ปั่น</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>นมสตอเบอร์รี่ปั่น</LanguageSlot6>
@@ -2779,7 +2779,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0009"
 		; begin lang 
-		Var aliasName[0] = "OREO SMOOTHIE \nVOLCANO"
+		Var aliasName[0] = "OREO VOLCANO"
 		Var aliasDesc[0] = "Milk, Sugar, Oreo, Ice"
 		Var aliasName[1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "นม น้ำตาล โอริโอ้ \n"
@@ -2809,7 +2809,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "OREO SMOOTHIE VOLCANO"
+		Var NameLang[2][0] = "OREO VOLCANO"
 		Var NameLang[2][1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2866,9 +2866,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>OREO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>OREO VOLCANO</LanguageSlot1>
 		<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>OREO VOLCANO</LanguageSlot3>
 		<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>
@@ -4097,7 +4097,7 @@
 		Var PD_CODE2 = "51-03-02-0025"
 		Var PD_CODE3 = "51-03-03-0025"
 		; begin lang 
-		Var aliasName[0] = "COCOA YUZU"
+		Var aliasName[0] = "CHOC YUZU"
 		Var aliasDesc[0] = "Cocoa and Yuzu syrup"
 		Var aliasName[1] = "โกโก้ยูซุ"
 		Var aliasDesc[1] = "โกโก้ และยูซุ"
@@ -4107,7 +4107,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot Cocoa Yuzu"
+		Var NameLang[0][0] = "Hot Choc Yuzu"
 		Var NameLang[0][1] = "โกโก้ยูซุร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -4117,7 +4117,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Yuzu"
-		Var NameLang[1][0] = "Iced Cocoa Yuzu"
+		Var NameLang[1][0] = "Iced Choc Yuzu"
 		Var NameLang[1][1] = "โกโก้ยูซุเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -4127,7 +4127,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Yuzu, Ais"
-		Var NameLang[2][0] = "Cocoa Yuzu SMOOTHIE"
+		Var NameLang[2][0] = "Choc Yuzu SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้ยูซุปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -4184,9 +4184,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA YUZU</LanguageSlot1>
+		<LanguageSlot1>CHOC YUZU</LanguageSlot1>
 		<LanguageSlot2>โกโก้ยูซุ</LanguageSlot2>
-		<LanguageSlot3>COCOA YUZU</LanguageSlot3>
+		<LanguageSlot3>CHOC YUZU</LanguageSlot3>
 		<LanguageSlot4>โกโก้ยูซุ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้ยูซุ</LanguageSlot6>
@@ -4891,7 +4891,7 @@
 		Var PD_CODE2 = "51-03-02-0024"
 		Var PD_CODE3 = "51-03-03-0024"
 		; begin lang 
-		Var aliasName[0] = "CHOCO TOKYO\nBANANA MILK"
+		Var aliasName[0] = "CHOC TOKYO\nBANANA MILK"
 		Var aliasDesc[0] = "Tokyo Banana Syrup, Milk, Sugar"
 		Var aliasName[1] = "นมช็อกโกโตเกียว\nบานาน่า"
 		Var aliasDesc[1] = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล"
@@ -4901,7 +4901,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "CHOCO TOKYO\nBANANA MILK"
+		Var NameLang[0][0] = "CHOC TOKYO\nBANANA MILK"
 		Var NameLang[0][1] = "นมช็อกโกโตเกียว\nบานาน่า"
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
@@ -4911,7 +4911,7 @@
 		Var DescLang[0][2] = "-"
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "Sirap Pisang Tokyo, Susu, Gula"
-		Var NameLang[1][0] = "Iced CHOCO TOKYO BANANA MILK"
+		Var NameLang[1][0] = "Iced CHOC TOKYO BANANA MILK"
 		Var NameLang[1][1] = "นมช็อกโกโตเกียวบานาน่าเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -4921,7 +4921,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Sirap Laici, Ais"
-		Var NameLang[2][0] = "CHOCO TOKYO BANANA MILK\nSMOOTHIE"
+		Var NameLang[2][0] = "CHOC TOKYO BANANA MILK\nSMOOTHIE"
 		Var NameLang[2][1] = "นมช็อกโกโตเกียวบานาน่าปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -4978,9 +4978,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>CHOCO TOKYO\nBANANA MILK</LanguageSlot1>
+		<LanguageSlot1>CHOC TOKYO\nBANANA MILK</LanguageSlot1>
 		<LanguageSlot2>นมช็อกโกโตเกียว\nบานาน่า</LanguageSlot2>
-		<LanguageSlot3>CHOCO TOKYO\nBANANA MILK</LanguageSlot3>
+		<LanguageSlot3>CHOC TOKYO\nBANANA MILK</LanguageSlot3>
 		<LanguageSlot4>นมช็อกโกโตเกียว\nบานาน่า</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>นมช็อกโกโตเกียว\nบานาน่า</LanguageSlot6>
@@ -5419,7 +5419,7 @@
 		Var PD_CODE2 = "51-03-02-0035"
 		Var PD_CODE3 = "51-03-03-0035"
 		; begin lang 
-		Var aliasName[0] = "COCOA MINT"
+		Var aliasName[0] = "CHOC MINT"
 		Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Cocoa"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -5429,7 +5429,7 @@
 		Var aliasDesc[3] = ""
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot Cocoa Mint"
+		Var NameLang[0][0] = "Hot Choc Mint"
 		Var NameLang[0][1] = "โกโก้มิ้นท์ร้อน"
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
@@ -5439,7 +5439,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "Iced Cocoa Mint"
+		Var NameLang[1][0] = "Iced Choc Mint"
 		Var NameLang[1][1] = "โกโก้มิ้นท์เย็น"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -5449,7 +5449,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = " Cocoa Mint smoothie"
+		Var NameLang[2][0] = " Choc Mint smoothie"
 		Var NameLang[2][1] = "โกโก้มิ้นท์ปั่น"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
@@ -5506,9 +5506,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA MINT</LanguageSlot1>
+		<LanguageSlot1>CHOC MINT</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>COCOA MINT</LanguageSlot3>
+		<LanguageSlot3>CHOC MINT</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -5951,7 +5951,7 @@
 		Var PD_CODE2 = "51-03-02-0037"
 		Var PD_CODE3 = "51-03-03-0037"
 		; begin lang 
-		Var aliasName[0] = "STRAWBERRY\nMINT MILK"
+		Var aliasName[0] = "STRAWBERRY\n& MINT MILK"
 		Var aliasDesc[0] = "Mint Syrup, Milk,\nStrawberry Syrup"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -5971,7 +5971,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = " Iced STRAWBERRY MINT MILK"
+		Var NameLang[1][0] = " Iced STRAWBERRY & MINT MILK"
 		Var NameLang[1][1] = "นมสตรอร์เบอร์รี่มินต์เย็น"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -5981,7 +5981,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = " STRAWBERRY MINT MILK\nSMOOTHIE"
+		Var NameLang[2][0] = " STRAWBERRY & MINT MILK\nSMOOTHIE"
 		Var NameLang[2][1] = "นมสตรอร์เบอร์รี่มินต์ปั่น"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
@@ -6038,9 +6038,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWBERRY\nMINT MILK</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY\n& MINT MILK</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>STRAWBERRY\nMINT MILK</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY\n& MINT MILK</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml
index 83676b02..d9e13145 100644
--- a/inter/aus/xml/page_catalog_group_recommend.lxml
+++ b/inter/aus/xml/page_catalog_group_recommend.lxml
@@ -8912,7 +8912,7 @@
 		Var PD_CODE2 = "51-03-02-0002"
 		Var PD_CODE3 = "51-03-03-0002"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -8922,7 +8922,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot COCOA"
+		Var NameLang[0][0] = "Hot CHOCOLATE"
 		Var NameLang[0][1] = "โกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -8932,7 +8932,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Gula"
-		Var NameLang[1][0] = "Iced COCOA"
+		Var NameLang[1][0] = "Iced CHOCOLATE"
 		Var NameLang[1][1] = "โกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -8942,7 +8942,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Gula, Ais"
-		Var NameLang[2][0] = "COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CHOCOLATE SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้เย็นปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -8999,9 +8999,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>
@@ -9736,7 +9736,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWMILK SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY MILK"
 		Var NameLang[2][1] = "นมสตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -10234,7 +10234,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0009"
 		; begin lang 
-		Var aliasName[0] = "OREO SMOOTHIE \nVOLCANO"
+		Var aliasName[0] = "OREO VOLCANO"
 		Var aliasDesc[0] = "Milk, Sugar, Oreo"
 		Var aliasName[1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "นม น้ำตาล โอริโอ้ \n"
@@ -10264,7 +10264,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "OREO SMOOTHIE VOLCANO"
+		Var NameLang[2][0] = "OREO VOLCANO"
 		Var NameLang[2][1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -10321,9 +10321,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>OREO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>OREO VOLCANO</LanguageSlot1>
 		<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>OREO VOLCANO</LanguageSlot3>
 		<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>