diff --git a/card_counter_constants.lua b/card_counter_constants.lua
index 8763607e1c..83ae96d9d3 100644
--- a/card_counter_constants.lua
+++ b/card_counter_constants.lua
@@ -38,7 +38,7 @@ CARD_DREAMING_NEMLERIA              = 70155677
 CARD_EHERO_BLAZEMAN                 = 63060238
 CARD_EVIL_EYE_SELENE                = 44133040
 CARD_EXCHANGE_SPIRIT                = 17484499
-CARD_FAIRY_PRINCE                   = 10000120
+CARD_PRINCE_OF_FAIRIES              = 10000120
 CARD_FAIRY_TALE_PROLOGUE            = 43236494
 CARD_FLAME_SWORDSMAN                = 45231177
 CARD_FIRE_FIST_EAGLE                = 46241344
diff --git a/pre-release/c101304084.lua b/official/c14556954.lua
similarity index 98%
rename from pre-release/c101304084.lua
rename to official/c14556954.lua
index 572d35d11a..515f1efc0d 100644
--- a/pre-release/c101304084.lua
+++ b/official/c14556954.lua
@@ -1,4 +1,4 @@
---JP name
+--豪回遊鯨ＶＩＰホエール
 --VIP Whale
 --scripted by pyrQ
 local s,id=GetID()
diff --git a/pre-release/c101304096.lua b/official/c1463589.lua
similarity index 94%
rename from pre-release/c101304096.lua
rename to official/c1463589.lua
index dc9d53d490..6218cc5c91 100644
--- a/pre-release/c101304096.lua
+++ b/official/c1463589.lua
@@ -1,4 +1,4 @@
---JP name
+--Ａ－ＧＭＸ最終検証
 --Anti-GMX Final Experiment
 --scripted by pyrQ
 local s,id=GetID()
@@ -34,7 +34,7 @@ function s.excavop(e,tp,eg,ep,ev,re,r,rp)
 	local decktop5=Duel.GetDecktopGroup(tp,5)
 	if #decktop5==0 then return end
 	Duel.ConfirmDecktop(tp,5)
-	Duel.RaiseEvent(decktop5,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,#decktop5)
+	Duel.RaiseEvent(decktop5,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,#decktop5)
 	if decktop5:IsExists(Card.IsSetCard,1,nil,SET_GMX) then
 		Duel.BreakEffect()
 		Duel.NegateEffect(ev)
diff --git a/pre-release/c101304081.lua b/official/c15778492.lua
similarity index 98%
rename from pre-release/c101304081.lua
rename to official/c15778492.lua
index 91bfce8642..b9882474b1 100644
--- a/pre-release/c101304081.lua
+++ b/official/c15778492.lua
@@ -1,4 +1,4 @@
---JP name
+--ゲーミング・ゲーマーＧＧ
 --Gaming Gamer GG
 --scripted by Naim
 local s,id=GetID()
diff --git a/pre-release/c101304092.lua b/official/c1595137.lua
similarity index 93%
rename from pre-release/c101304092.lua
rename to official/c1595137.lua
index a9619bbf83..1eb9a3d47c 100644
--- a/pre-release/c101304092.lua
+++ b/official/c1595137.lua
@@ -1,4 +1,4 @@
---JP name
+--暁世竜ダニアン
 --Evolved Daneen
 --scripted by pyrQ
 local s,id=GetID()
@@ -22,7 +22,7 @@ function s.initial_effect(c)
 	e2:SetDescription(aux.Stringid(id,1))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetCode(EVENT_CUSTOM+101304092)
+	e2:SetCode(EVENT_CUSTOM+1595137)
 	e2:SetRange(LOCATION_MZONE|LOCATION_GRAVE)
 	e2:SetCountLimit(1,{id,1})
 	e2:SetCondition(s.effcon)
@@ -55,7 +55,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
 	--● Field: Gain 1500 LP
 	local b1=not Duel.HasFlagEffect(tp,id) and c:IsLocation(LOCATION_MZONE)
 	--● GY: Special Summon this card
-	local b2=not Duel.HasFlagEffect(tp,id+100) and c:IsLocation(LOCATION_GRAVE)
+	local b2=not Duel.HasFlagEffect(tp,id+1) and c:IsLocation(LOCATION_GRAVE)
 		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 	if chk==0 then return b1 or b2 end
@@ -67,7 +67,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
 		Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,1500)
 	elseif op==2 then
 		e:SetCategory(CATEGORY_SPECIAL_SUMMON)
-		Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE|PHASE_END,0,1)
+		Duel.RegisterFlagEffect(tp,id+1,RESET_PHASE|PHASE_END,0,1)
 		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,tp,0)
 	end
 end
@@ -83,4 +83,4 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
-end
+end
\ No newline at end of file
diff --git a/official/c18795635.lua b/official/c18795635.lua
index 1b8c9e1f8c..7babe78510 100644
--- a/official/c18795635.lua
+++ b/official/c18795635.lua
@@ -1,4 +1,4 @@
---JP name
+--第５５次ＧＭＸ応用試験
 --GMX Applied Experiment #55
 --scripted by pyrQ
 local s,id=GetID()
@@ -31,7 +31,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if #gmx_g==0 or #dino_g==0 then
 		Duel.ConfirmDecktop(tp,deck_count)
 		local excav_g=Duel.GetDecktopGroup(tp,deck_count)
-		Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,deck_count)
+		Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,deck_count)
 		Duel.SetLP(tp,Duel.GetLP(tp)-deck_count*400)
 	else
 		local gmx_c=gmx_g:GetMaxGroup(Card.GetSequence):GetFirst()
@@ -39,7 +39,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		local excav_count=deck_count-math.min(gmx_c:GetSequence(),dino_c:GetSequence())
 		Duel.ConfirmDecktop(tp,excav_count)
 		local excav_g=Duel.GetDecktopGroup(tp,excav_count)
-		Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,excav_count)
+		Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,excav_count)
 		Duel.SetLP(tp,Duel.GetLP(tp)-excav_count*400)
 		local excav_monsters=Duel.GetDecktopGroup(tp,excav_count):Match(Card.IsMonster,nil)
 		local fusion_params={
diff --git a/official/c19144622.lua b/official/c19144622.lua
index 212144217c..d296a243bf 100644
--- a/official/c19144622.lua
+++ b/official/c19144622.lua
@@ -40,7 +40,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 s.listed_series={SET_FAIRY_TAIL}
-s.listed_names={91957038,CARD_FAIRY_PRINCE} --"Fairy Tail Tales"
+s.listed_names={91957038,CARD_PRINCE_OF_FAIRIES} --"Fairy Tale Tails"
 function s.spconfilter(c)
 	return c:IsRace(RACE_SPELLCASTER) and c:IsBaseAttack(1850) and c:IsFaceup()
 end
@@ -85,7 +85,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.namechangefilter(c)
-	return c:IsType(TYPE_EFFECT) and c:IsFaceup() and not c:IsCode(CARD_FAIRY_PRINCE)
+	return c:IsType(TYPE_EFFECT) and c:IsFaceup() and not c:IsCode(CARD_PRINCE_OF_FAIRIES)
 end
 function s.namechangetg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.namechangefilter,tp,0,LOCATION_MZONE,1,nil) end
@@ -100,7 +100,7 @@ function s.namechangeop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e1:SetCode(EFFECT_CHANGE_CODE)
-		e1:SetValue(CARD_FAIRY_PRINCE)
+		e1:SetValue(CARD_PRINCE_OF_FAIRIES)
 		e1:SetReset(RESET_EVENT|RESETS_STANDARD)
 		sc:RegisterEffect(e1)
 	end
diff --git a/pre-release/c101304090.lua b/official/c2618725.lua
similarity index 98%
rename from pre-release/c101304090.lua
rename to official/c2618725.lua
index 14ea17cc74..45081e84c7 100644
--- a/pre-release/c101304090.lua
+++ b/official/c2618725.lua
@@ -1,4 +1,4 @@
---JP name
+--ＧＭＸ同絆者セランディア
 --GMX Partner Selandea
 --scripted by pyrQ
 local s,id=GetID()
diff --git a/pre-release/c101304087.lua b/official/c3434362.lua
similarity index 98%
rename from pre-release/c101304087.lua
rename to official/c3434362.lua
index 55bebb5817..5762abb1a2 100644
--- a/pre-release/c101304087.lua
+++ b/official/c3434362.lua
@@ -1,4 +1,4 @@
---JP name
+--ラスティン・マンモス
 --Rustin Mammoth
 --scripted by Naim
 local s,id=GetID()
diff --git a/pre-release/c101304094.lua b/official/c38984832.lua
similarity index 88%
rename from pre-release/c101304094.lua
rename to official/c38984832.lua
index 700ba1ddf0..9f16f59e26 100644
--- a/pre-release/c101304094.lua
+++ b/official/c38984832.lua
@@ -1,15 +1,15 @@
---JP name
+--第５５次ＧＭＸ試験報告
 --GMX 55th Experiment Report
 --scripted by pyrQ
 local s,id=GetID()
 function s.initial_effect(c)
 	--Fusion Summon 1 Dinosaur Fusion Monster from your Extra Deck using monsters from your hand or field. If your opponent controls a monster, you can also use 1 "GMX" monster in your Deck as material
 	local e1=Fusion.CreateSummonEff({
-			handler=c,
-			fusfilter=function(c) return c:IsRace(RACE_DINOSAUR) end,
-			extrafil=s.fextra,
-			extratg=s.extratg
-		})
+		handler=c,
+		fusfilter=function(c) return c:IsRace(RACE_DINOSAUR) end,
+		extrafil=s.fextra,
+		extratg=s.extratg
+	})
 	e1:SetCountLimit(1,id)
 	e1:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E)
 	c:RegisterEffect(e1)
@@ -59,14 +59,14 @@ function s.excavop(e,tp,eg,ep,ev,re,r,rp)
 		if #g==0 then
 			Duel.ConfirmDecktop(tp,deck_count)
 			local excav_g=Duel.GetDecktopGroup(tp,deck_count)
-			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,deck_count)
+			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,deck_count)
 		else
 			local sc=g:GetMaxGroup(Card.GetSequence):GetFirst()
 			local sc_seq=sc:GetSequence()
 			local excav_count=deck_count-sc_seq
 			Duel.ConfirmDecktop(tp,excav_count)
 			local excav_g=Duel.GetDecktopGroup(tp,excav_count)
-			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,excav_count)
+			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,excav_count)
 			if Duel.SendtoHand(sc,nil,REASON_EFFECT) then
 				Duel.ConfirmCards(1-tp,sc)
 				Duel.ShuffleHand(tp)
diff --git a/pre-release/c101304091.lua b/official/c39706423.lua
similarity index 94%
rename from pre-release/c101304091.lua
rename to official/c39706423.lua
index 9ebec69fa7..4b38c46aee 100644
--- a/pre-release/c101304091.lua
+++ b/official/c39706423.lua
@@ -1,4 +1,4 @@
---JP name
+--ＧＭＸ鎮圧部隊アプト
 --GMX Suppression Squad
 --scripted by pyrQ
 local s,id=GetID()
@@ -63,14 +63,14 @@ function s.excavop(e,tp,eg,ep,ev,re,r,rp)
 		if #g==0 then
 			Duel.ConfirmDecktop(tp,deck_count)
 			local excav_g=Duel.GetDecktopGroup(tp,deck_count)
-			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,deck_count)
+			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,deck_count)
 		else
 			local sc=g:GetMaxGroup(Card.GetSequence):GetFirst()
 			local sc_seq=sc:GetSequence()
 			local excav_count=deck_count-sc_seq
 			Duel.ConfirmDecktop(tp,excav_count)
 			local excav_g=Duel.GetDecktopGroup(tp,excav_count)
-			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,excav_count)
+			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,excav_count)
 			local tc=Duel.GetFirstTarget()
 			if Duel.SendtoGrave(sc,REASON_EFFECT|REASON_EXCAVATE) and sc:IsLocation(LOCATION_GRAVE) and tc:IsRelateToEffect(e)
 				and tc:IsFaceup() and not tc:IsRace(RACE_DINOSAUR) then
diff --git a/pre-release/c101304085.lua b/official/c40041559.lua
similarity index 99%
rename from pre-release/c101304085.lua
rename to official/c40041559.lua
index 9ddb4e84a4..dae4053bad 100644
--- a/pre-release/c101304085.lua
+++ b/official/c40041559.lua
@@ -1,4 +1,4 @@
---JP name
+--指環の精霊ジーニャ
 --Genia of the Ring
 --scripted by Naim
 local s,id=GetID()
diff --git a/official/c4026187.lua b/official/c4026187.lua
index 98440fdf4e..613eb77ad9 100644
--- a/official/c4026187.lua
+++ b/official/c4026187.lua
@@ -30,7 +30,7 @@ function s.initial_effect(c)
 	local e2b=Effect.CreateEffect(c)
 	e2b:SetType(EFFECT_TYPE_SINGLE)
 	e2b:SetCode(EFFECT_MATERIAL_CHECK)
-	e2b:SetValue(function(e,c) e2a:SetLabel(c:GetMaterial():IsExists(Card.IsCode,1,nil,CARD_FAIRY_PRINCE) and 1 or 0) end)
+	e2b:SetValue(function(e,c) e2a:SetLabel(c:GetMaterial():IsExists(Card.IsCode,1,nil,CARD_PRINCE_OF_FAIRIES) and 1 or 0) end)
 	c:RegisterEffect(e2b)
 	--Negate the activation of an opponent's card or effect, and if you do, destroy that card
 	local e3=Effect.CreateEffect(c)
@@ -48,7 +48,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 s.listed_series={SET_FAIRY_TAIL}
-s.listed_names={CARD_FAIRY_PRINCE}
+s.listed_names={CARD_PRINCE_OF_FAIRIES}
 s.material_setcode={SET_FAIRY_TAIL}
 function s.matfilter(c,fc,sumtype,tp)
 	return c:IsAttribute(ATTRIBUTE_LIGHT,fc,sumtype,tp) and c:IsSetCard(SET_FAIRY_TAIL,fc,sumtype,tp)
diff --git a/pre-release/c101304082.lua b/official/c41763141.lua
similarity index 99%
rename from pre-release/c101304082.lua
rename to official/c41763141.lua
index 86d0064ba8..1aa7341393 100644
--- a/pre-release/c101304082.lua
+++ b/official/c41763141.lua
@@ -1,4 +1,4 @@
---JP name
+--蜃欺龍
 --Fata Dragna
 --Scripted by The Razgriz
 local s,id=GetID()
diff --git a/pre-release/c101304088.lua b/official/c49828011.lua
similarity index 99%
rename from pre-release/c101304088.lua
rename to official/c49828011.lua
index 3926dd36bb..46b0c3f4c2 100644
--- a/pre-release/c101304088.lua
+++ b/official/c49828011.lua
@@ -1,4 +1,4 @@
---JP name
+--祭司 レヴァリー
 --Officiating Reverie
 --scripted by pyrQ
 local s,id=GetID()
diff --git a/official/c56725612.lua b/official/c56725612.lua
index c8481f8a3d..dba83238f4 100644
--- a/official/c56725612.lua
+++ b/official/c56725612.lua
@@ -35,7 +35,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 s.listed_series={SET_FAIRY_TAIL}
-s.listed_names={91957038,CARD_FAIRY_PRINCE} --"Fairy Tail Tales"
+s.listed_names={91957038,CARD_PRINCE_OF_FAIRIES} --"Fairy Tale Tails"
 function s.thfilter(c)
 	return ((c:IsSetCard(SET_FAIRY_TAIL) and c:IsMonster()) or c:IsCode(91957038)) and c:IsAbleToHand()
 		and (c:IsLocation(LOCATION_DECK) or c:IsFaceup())
@@ -52,7 +52,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.disfilter(c)
-	return c:IsType(TYPE_EFFECT) and c:IsFaceup() and (c:IsNegatableMonster() or not c:IsCode(CARD_FAIRY_PRINCE))
+	return c:IsType(TYPE_EFFECT) and c:IsFaceup() and (c:IsNegatableMonster() or not c:IsCode(CARD_PRINCE_OF_FAIRIES))
 end
 function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and s.disfilter(chkc) end
@@ -73,7 +73,7 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e1:SetCode(EFFECT_CHANGE_CODE)
-		e1:SetValue(CARD_FAIRY_PRINCE)
+		e1:SetValue(CARD_PRINCE_OF_FAIRIES)
 		e1:SetReset(RESET_EVENT|RESETS_STANDARD)
 		tc:RegisterEffect(e1)
 	end
diff --git a/pre-release/c101304095.lua b/official/c74378580.lua
similarity index 98%
rename from pre-release/c101304095.lua
rename to official/c74378580.lua
index 4806568873..f26c2a2655 100644
--- a/pre-release/c101304095.lua
+++ b/official/c74378580.lua
@@ -1,4 +1,4 @@
---JP name
+--旧ＧＭＸ第５研究所
 --GMX Lab #5
 --scripted by pyrQ
 local s,id=GetID()
diff --git a/pre-release/c101304093.lua b/official/c75191028.lua
similarity index 98%
rename from pre-release/c101304093.lua
rename to official/c75191028.lua
index df8f73a087..30fb821d76 100644
--- a/pre-release/c101304093.lua
+++ b/official/c75191028.lua
@@ -1,4 +1,4 @@
---JP name
+--ＧＭＸ－ＣＯＭＰＲＥＸ
 --GMX - COMPREX
 --scripted by pyrQ
 local s,id=GetID()
@@ -25,7 +25,7 @@ function s.initial_effect(c)
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetCode(EVENT_CUSTOM+101304092)
+	e2:SetCode(EVENT_CUSTOM+1595137)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(s.descon)
diff --git a/pre-release/c101304089.lua b/official/c76213610.lua
similarity index 99%
rename from pre-release/c101304089.lua
rename to official/c76213610.lua
index e58fa97726..7c05646d43 100644
--- a/pre-release/c101304089.lua
+++ b/official/c76213610.lua
@@ -1,4 +1,4 @@
---JP name
+--死宰 サムエル
 --Officiator of Doom Samuel
 --scripted by pyrQ
 local s,id=GetID()
diff --git a/pre-release/c101304083.lua b/official/c77157846.lua
similarity index 99%
rename from pre-release/c101304083.lua
rename to official/c77157846.lua
index 3d64c4e2fd..84074395bc 100644
--- a/pre-release/c101304083.lua
+++ b/official/c77157846.lua
@@ -1,4 +1,4 @@
---JP name
+--暗翳の信仰者
 --Shade the Obscure
 --Scripted by Hatter
 local s,id=GetID()
diff --git a/pre-release/c101304086.lua b/official/c77435268.lua
similarity index 98%
rename from pre-release/c101304086.lua
rename to official/c77435268.lua
index e4834cbe90..9cb7b99823 100644
--- a/pre-release/c101304086.lua
+++ b/official/c77435268.lua
@@ -1,8 +1,8 @@
---JP name
+--チェツカー
 --Checkker
 --Scripted by The Razgriz
 local s,id=GetID()
-local TOKEN_IRON_RUBBLE=id+100
+local TOKEN_IRON_RUBBLE=id+1
 function s.initial_effect(c)
 	--Cannot be Normal Summoned if you control a monster
 	local e0=Effect.CreateEffect(c)
diff --git a/official/c78021082.lua b/official/c78021082.lua
index 775975c06f..bb2b52f3be 100644
--- a/official/c78021082.lua
+++ b/official/c78021082.lua
@@ -38,12 +38,12 @@ function s.initial_effect(c)
 	e3:SetCode(EFFECT_CHANGE_RACE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(function(e,c) return c:IsCode(CARD_FAIRY_PRINCE) end)
+	e3:SetTarget(function(e,c) return c:IsCode(CARD_PRINCE_OF_FAIRIES) end)
 	e3:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e3)
 end
 s.listed_series={SET_FAIRY_TAIL}
-s.listed_names={CARD_FAIRY_PRINCE}
+s.listed_names={CARD_PRINCE_OF_FAIRIES}
 s.material_setcode={SET_FAIRY_TAIL}
 function s.spfilter(c,e,tp)
 	return c:IsSetCard(SET_FAIRY_TAIL) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and (c:IsLocation(LOCATION_DECK) or c:IsFaceup())
@@ -68,7 +68,7 @@ function s.discon(e,tp,eg,ep,ev,re,r,rp)
 	return not eg:IsContains(e:GetHandler()) and eg:IsExists(s.disconfilter,1,nil,tp)
 end
 function s.disfilter(c)
-	return c:IsType(TYPE_EFFECT) and c:IsFaceup() and (c:IsNegatableMonster() or not c:IsCode(CARD_FAIRY_PRINCE))
+	return c:IsType(TYPE_EFFECT) and c:IsFaceup() and (c:IsNegatableMonster() or not c:IsCode(CARD_PRINCE_OF_FAIRIES))
 end
 function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and s.disfilter(chkc) end
@@ -88,7 +88,7 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e1:SetCode(EFFECT_CHANGE_CODE)
-		e1:SetValue(CARD_FAIRY_PRINCE)
+		e1:SetValue(CARD_PRINCE_OF_FAIRIES)
 		e1:SetReset(RESET_EVENT|RESETS_STANDARD)
 		tc:RegisterEffect(e1)
 	end
diff --git a/official/c82119326.lua b/official/c82119326.lua
index 87d24d4647..08bfa2b7ed 100644
--- a/official/c82119326.lua
+++ b/official/c82119326.lua
@@ -12,10 +12,10 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 	--Fusion Summon 1 Spellcaster Fusion Monster from your Extra Deck, using monsters from your hand or field, when you do, you can also use any "Fairy Prince" your opponent controls
 	local fusion_params={
-			handler=c,
-			fusfilter=aux.FilterBoolFunction(Card.IsRace,RACE_SPELLCASTER),
-			extrafil=function(e,tp,mg) return Duel.GetMatchingGroup(Fusion.IsMonsterFilter(aux.FaceupFilter(Card.IsCode,CARD_FAIRY_PRINCE)),tp,0,LOCATION_ONFIELD,nil) end
-		}
+		handler=c,
+		fusfilter=aux.FilterBoolFunction(Card.IsRace,RACE_SPELLCASTER),
+		extrafil=function(e,tp,mg) return Duel.GetMatchingGroup(Fusion.IsMonsterFilter(aux.FaceupFilter(Card.IsCode,CARD_PRINCE_OF_FAIRIES)),tp,0,LOCATION_ONFIELD,nil) end
+	}
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
@@ -37,7 +37,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 s.listed_series={SET_FAIRY_TAIL}
-s.listed_names={CARD_FAIRY_PRINCE}
+s.listed_names={CARD_PRINCE_OF_FAIRIES}
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 		and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsSetCard,SET_FAIRY_TAIL),tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
diff --git a/official/c82706696.lua b/official/c82706696.lua
index bf0199adff..628dc02105 100644
--- a/official/c82706696.lua
+++ b/official/c82706696.lua
@@ -1,4 +1,4 @@
---JP name
+--ＧＭＸ－ＶＥＬＯＸ
 --GMX - VELOX
 --scripted by pyrQ
 local s,id=GetID()
@@ -78,7 +78,7 @@ function s.excavop(e,tp,eg,ep,ev,re,r,rp)
 		if #g==0 then
 			Duel.ConfirmDecktop(tp,deck_count)
 			local excav_g=Duel.GetDecktopGroup(tp,deck_count)
-			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,deck_count)
+			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,deck_count)
 			Duel.SetLP(tp,Duel.GetLP(tp)-deck_count*400)
 		else
 			local sc=g:GetMaxGroup(Card.GetSequence):GetFirst()
@@ -86,7 +86,7 @@ function s.excavop(e,tp,eg,ep,ev,re,r,rp)
 			local excav_count=deck_count-sc_seq
 			Duel.ConfirmDecktop(tp,excav_count)
 			local excav_g=Duel.GetDecktopGroup(tp,excav_count)
-			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+101304092,e,REASON_EFFECT,tp,tp,excav_count)
+			Duel.RaiseEvent(excav_g,EVENT_CUSTOM+1595137,e,REASON_EFFECT,tp,tp,excav_count)
 			Duel.SetLP(tp,Duel.GetLP(tp)-excav_count*400)
 			aux.ToHandOrElse(sc,tp,
 				function()