Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.

-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.

Two minor changes in addition :

-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.

76 files changed, 336 insertions, 336 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
index ab142c1375c..63827c48f44 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -267,7 +267,7 @@ public:
 
     class spell_elder_nadox_guardian_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_elder_nadox_guardian_SpellScript);
+        PrepareSpellScript(spell_elder_nadox_guardian_SpellScript)
 
         void FilterTargets(std::list<WorldObject*>& targets)
         {
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index e3156e21371..f392bea327b 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -417,7 +417,7 @@ class spell_prince_taldaram_conjure_flame_sphere : public SpellScriptLoader
 
         class spell_prince_taldaram_conjure_flame_sphere_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_prince_taldaram_conjure_flame_sphere_SpellScript);
+            PrepareSpellScript(spell_prince_taldaram_conjure_flame_sphere_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -460,7 +460,7 @@ class spell_prince_taldaram_flame_sphere_summon : public SpellScriptLoader
 
         class spell_prince_taldaram_flame_sphere_summon_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_prince_taldaram_flame_sphere_summon_SpellScript);
+            PrepareSpellScript(spell_prince_taldaram_flame_sphere_summon_SpellScript)
 
             void SetDest(SpellDestination& dest)
             {
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
index 69605574f86..5eae42d2abd 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
@@ -312,7 +312,7 @@ class spell_baltharus_enervating_brand_trigger : public SpellScriptLoader
 
         class spell_baltharus_enervating_brand_trigger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_baltharus_enervating_brand_trigger_SpellScript);
+            PrepareSpellScript(spell_baltharus_enervating_brand_trigger_SpellScript)
 
             void CheckDistance()
             {
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index f352b4faace..e4167fc28ad 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -1342,7 +1342,7 @@ class spell_halion_meteor_strike_marker : public SpellScriptLoader
 
         class spell_halion_meteor_strike_marker_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_meteor_strike_marker_AuraScript);
+            PrepareAuraScript(spell_halion_meteor_strike_marker_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -1373,7 +1373,7 @@ class spell_halion_combustion_consumption : public SpellScriptLoader
 
         class spell_halion_combustion_consumption_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_combustion_consumption_AuraScript);
+            PrepareAuraScript(spell_halion_combustion_consumption_AuraScript)
 
         public:
             spell_halion_combustion_consumption_AuraScript(uint32 spellID) : AuraScript(), _markSpell(spellID) { }
@@ -1431,7 +1431,7 @@ class spell_halion_marks : public SpellScriptLoader
 
         class spell_halion_marks_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_marks_AuraScript);
+            PrepareAuraScript(spell_halion_marks_AuraScript)
 
         public:
             spell_halion_marks_AuraScript(uint32 summonSpell, uint32 removeSpell) : AuraScript(),
@@ -1491,7 +1491,7 @@ class spell_halion_damage_aoe_summon : public SpellScriptLoader
 
         class spell_halion_damage_aoe_summon_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_damage_aoe_summon_SpellScript);
+            PrepareSpellScript(spell_halion_damage_aoe_summon_SpellScript)
 
             void HandleSummon(SpellEffIndex effIndex)
             {
@@ -1528,7 +1528,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader
 
         class spell_halion_twilight_realm_handlers_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_twilight_realm_handlers_AuraScript);
+            PrepareAuraScript(spell_halion_twilight_realm_handlers_AuraScript)
 
         public:
             spell_halion_twilight_realm_handlers_AuraScript(uint32 beforeHitSpell, bool isApplyHandler) : AuraScript(),
@@ -1592,7 +1592,7 @@ class spell_halion_clear_debuffs : public SpellScriptLoader
 
         class spell_halion_clear_debuffs_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_clear_debuffs_SpellScript);
+            PrepareSpellScript(spell_halion_clear_debuffs_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1643,7 +1643,7 @@ class spell_halion_twilight_cutter : public SpellScriptLoader
 
         class spell_halion_twilight_cutter_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_twilight_cutter_SpellScript);
+            PrepareSpellScript(spell_halion_twilight_cutter_SpellScript)
 
             void RemoveNotBetween(std::list<WorldObject*>& unitList)
             {
@@ -1680,7 +1680,7 @@ class spell_halion_twilight_phasing : public SpellScriptLoader
 
         class spell_halion_twilight_phasing_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_twilight_phasing_SpellScript);
+            PrepareSpellScript(spell_halion_twilight_phasing_SpellScript)
 
             void Phase()
             {
@@ -1709,7 +1709,7 @@ class spell_halion_summon_exit_portals : public SpellScriptLoader
 
         class spell_halion_summon_exit_portals_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_summon_exit_portals_SpellScript);
+            PrepareSpellScript(spell_halion_summon_exit_portals_SpellScript)
 
             void SetDest0(SpellDestination& dest)
             {
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
index 199337b0631..eab099ccabe 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
@@ -221,7 +221,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader
 
         class spell_saviana_conflagration_init_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_saviana_conflagration_init_SpellScript);
+            PrepareSpellScript(spell_saviana_conflagration_init_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -258,7 +258,7 @@ class spell_saviana_conflagration_throwback : public SpellScriptLoader
 
         class spell_saviana_conflagration_throwback_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_saviana_conflagration_throwback_SpellScript);
+            PrepareSpellScript(spell_saviana_conflagration_throwback_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index cb0cba21d6c..99390da7dcd 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -128,7 +128,7 @@ class spell_eadric_radiance : public SpellScriptLoader
         spell_eadric_radiance() : SpellScriptLoader("spell_eadric_radiance") { }
         class spell_eadric_radiance_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_eadric_radiance_SpellScript);
+            PrepareSpellScript(spell_eadric_radiance_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -627,7 +627,7 @@ class spell_paletress_summon_memory : public SpellScriptLoader
 
         class spell_paletress_summon_memory_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_paletress_summon_memory_SpellScript);
+            PrepareSpellScript(spell_paletress_summon_memory_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 77e4e740333..355e3cade4d 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -815,7 +815,7 @@ class spell_impale : public SpellScriptLoader
 
         class spell_impale_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_impale_SpellScript);
+            PrepareSpellScript(spell_impale_SpellScript)
 
             void HandleDamageCalc(SpellEffIndex /*effIndex*/)
             {
@@ -846,7 +846,7 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader
 
         class spell_anubarak_leeching_swarm_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_anubarak_leeching_swarm_AuraScript);
+            PrepareAuraScript(spell_anubarak_leeching_swarm_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index 71df7d05378..5cdce96d5ae 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -2232,7 +2232,7 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader
 
         class spell_faction_champion_warl_unstable_affliction_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_faction_champion_warl_unstable_affliction_AuraScript);
+            PrepareAuraScript(spell_faction_champion_warl_unstable_affliction_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2266,7 +2266,7 @@ class spell_faction_champion_death_grip : public SpellScriptLoader
 
         class spell_faction_champion_death_grip_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_faction_champion_death_grip_SpellScript);
+            PrepareSpellScript(spell_faction_champion_death_grip_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2304,7 +2304,7 @@ class spell_toc_bloodlust : public SpellScriptLoader
 
         class spell_toc_bloodlust_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_toc_bloodlust_SpellScript);
+            PrepareSpellScript(spell_toc_bloodlust_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2345,7 +2345,7 @@ class spell_toc_heroism : public SpellScriptLoader
 
         class spell_toc_heroism_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_toc_heroism_SpellScript);
+            PrepareSpellScript(spell_toc_heroism_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index abeafe156ad..6acaf4895ec 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -495,7 +495,7 @@ class spell_mistress_kiss : public SpellScriptLoader
 
         class spell_mistress_kiss_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mistress_kiss_AuraScript);
+            PrepareAuraScript(spell_mistress_kiss_AuraScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index f45a57bd0bc..63236d68f58 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -819,7 +819,7 @@ class spell_gormok_fire_bomb : public SpellScriptLoader
 
         class spell_gormok_fire_bomb_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gormok_fire_bomb_SpellScript);
+            PrepareSpellScript(spell_gormok_fire_bomb_SpellScript)
 
             void TriggerFireBomb(SpellEffIndex /*effIndex*/)
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 00eb970b57b..8176422eed6 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -731,7 +731,7 @@ class spell_valkyr_essences : public SpellScriptLoader
 
         class spell_valkyr_essences_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_valkyr_essences_AuraScript);
+            PrepareAuraScript(spell_valkyr_essences_AuraScript)
 
             uint32 spellId;
 
@@ -826,7 +826,7 @@ class spell_power_of_the_twins : public SpellScriptLoader
 
         class spell_power_of_the_twins_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_power_of_the_twins_AuraScript);
+            PrepareAuraScript(spell_power_of_the_twins_AuraScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 72e4b0b5eb9..c67193fc11e 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -354,7 +354,7 @@ class spell_novos_summon_minions : public SpellScriptLoader
 
         class spell_novos_summon_minions_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_novos_summon_minions_SpellScript);
+            PrepareSpellScript(spell_novos_summon_minions_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 77f026b1d3a..1b6cfceaf6c 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -212,7 +212,7 @@ class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScriptLoader
 
         class spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript);
+            PrepareSpellScript(spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 13d968d9e06..9ac087f5a45 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -219,7 +219,7 @@ class spell_trollgore_consume : public SpellScriptLoader
 
         class spell_trollgore_consume_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_trollgore_consume_SpellScript);
+            PrepareSpellScript(spell_trollgore_consume_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -254,7 +254,7 @@ class spell_trollgore_corpse_explode : public SpellScriptLoader
 
         class spell_trollgore_corpse_explode_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_trollgore_corpse_explode_AuraScript);
+            PrepareAuraScript(spell_trollgore_corpse_explode_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -297,7 +297,7 @@ class spell_trollgore_invader_taunt : public SpellScriptLoader
 
         class spell_trollgore_invader_taunt_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_trollgore_invader_taunt_SpellScript);
+            PrepareSpellScript(spell_trollgore_invader_taunt_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index fe98f005bca..526c412cfce 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -239,7 +239,7 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader
 
         class spell_bronjahm_magic_bane_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_bronjahm_magic_bane_SpellScript);
+            PrepareSpellScript(spell_bronjahm_magic_bane_SpellScript)
 
             void RecalculateDamage()
             {
@@ -273,7 +273,7 @@ class spell_bronjahm_consume_soul : public SpellScriptLoader
 
         class spell_bronjahm_consume_soul_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_bronjahm_consume_soul_SpellScript);
+            PrepareSpellScript(spell_bronjahm_consume_soul_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -300,7 +300,7 @@ class spell_bronjahm_soulstorm_channel : public SpellScriptLoader
 
         class spell_bronjahm_soulstorm_channel_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_bronjahm_soulstorm_channel_AuraScript);
+            PrepareAuraScript(spell_bronjahm_soulstorm_channel_AuraScript)
 
             void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
             {
@@ -328,7 +328,7 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader
 
         class spell_bronjahm_soulstorm_visual_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_bronjahm_soulstorm_visual_AuraScript);
+            PrepareAuraScript(spell_bronjahm_soulstorm_visual_AuraScript)
 
             void HandlePeriodicTick(AuraEffect const* aurEff)
             {
@@ -374,7 +374,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader
 
         class spell_bronjahm_soulstorm_targeting_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_bronjahm_soulstorm_targeting_SpellScript);
+            PrepareSpellScript(spell_bronjahm_soulstorm_targeting_SpellScript)
 
             void FilterTargetsInitial(std::list<WorldObject*>& targets)
             {
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index e64067fb995..4c0e10780be 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -357,7 +357,7 @@ class spell_devourer_of_souls_mirrored_soul : public SpellScriptLoader
 
         class spell_devourer_of_souls_mirrored_soul_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_SpellScript);
+            PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -392,7 +392,7 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader
 
         class spell_devourer_of_souls_mirrored_soul_proc_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_devourer_of_souls_mirrored_soul_proc_AuraScript);
+            PrepareAuraScript(spell_devourer_of_souls_mirrored_soul_proc_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -439,7 +439,7 @@ class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript
 
         class spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript);
+            PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index 902a917c594..b18e5ea28c6 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -139,7 +139,7 @@ class spell_marwyn_shared_suffering : public SpellScriptLoader
 
         class spell_marwyn_shared_suffering_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_marwyn_shared_suffering_AuraScript);
+            PrepareAuraScript(spell_marwyn_shared_suffering_AuraScript)
 
             void HandleEffectRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
             {
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index 9cbd296d69e..392d604c8f8 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -246,7 +246,7 @@ class spell_garfrost_permafrost : public SpellScriptLoader
 
         class spell_garfrost_permafrost_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_garfrost_permafrost_SpellScript);
+            PrepareSpellScript(spell_garfrost_permafrost_SpellScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index 26ab1f61ae8..c83c6cdaa50 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -504,7 +504,7 @@ class spell_krick_explosive_barrage : public SpellScriptLoader
 
         class spell_krick_explosive_barrage_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_krick_explosive_barrage_AuraScript);
+            PrepareAuraScript(spell_krick_explosive_barrage_AuraScript)
 
             void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
             {
@@ -539,7 +539,7 @@ class spell_ick_explosive_barrage : public SpellScriptLoader
 
         class spell_ick_explosive_barrage_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ick_explosive_barrage_AuraScript);
+            PrepareAuraScript(spell_ick_explosive_barrage_AuraScript)
 
             void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -578,7 +578,7 @@ class spell_exploding_orb_hasty_grow : public SpellScriptLoader
 
         class spell_exploding_orb_hasty_grow_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_exploding_orb_hasty_grow_AuraScript);
+            PrepareAuraScript(spell_exploding_orb_hasty_grow_AuraScript)
 
             void OnStackChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -613,7 +613,7 @@ class spell_krick_pursuit : public SpellScriptLoader
 
         class spell_krick_pursuit_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_krick_pursuit_SpellScript);
+            PrepareSpellScript(spell_krick_pursuit_SpellScript)
 
             void HandleScriptEffect(SpellEffIndex /*effIndex*/)
             {
@@ -639,7 +639,7 @@ class spell_krick_pursuit : public SpellScriptLoader
 
         class spell_krick_pursuit_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_krick_pursuit_AuraScript);
+            PrepareAuraScript(spell_krick_pursuit_AuraScript)
 
             void HandleExtraEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -672,7 +672,7 @@ class spell_krick_pursuit_confusion : public SpellScriptLoader
 
         class spell_krick_pursuit_confusion_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_krick_pursuit_confusion_AuraScript);
+            PrepareAuraScript(spell_krick_pursuit_confusion_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index a501bf4ea55..fd5fda682be 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -413,7 +413,7 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader
 
         class spell_tyrannus_overlord_brand_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_tyrannus_overlord_brand_AuraScript);
+            PrepareAuraScript(spell_tyrannus_overlord_brand_AuraScript)
 
             bool Load() override
             {
@@ -465,7 +465,7 @@ class spell_tyrannus_mark_of_rimefang : public SpellScriptLoader
 
         class spell_tyrannus_mark_of_rimefang_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_tyrannus_mark_of_rimefang_AuraScript);
+            PrepareAuraScript(spell_tyrannus_mark_of_rimefang_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 7bd9325dd97..21d3766d766 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -212,7 +212,7 @@ class spell_trash_npc_glacial_strike : public SpellScriptLoader
 
         class spell_trash_npc_glacial_strike_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_trash_npc_glacial_strike_AuraScript);
+            PrepareAuraScript(spell_trash_npc_glacial_strike_AuraScript)
 
             void PeriodicTick(AuraEffect const* /*aurEff*/)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index a9088207ebe..5824b1b65de 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -1373,7 +1373,7 @@ class spell_taldaram_glittering_sparks : public SpellScriptLoader
 
         class spell_taldaram_glittering_sparks_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_taldaram_glittering_sparks_SpellScript);
+            PrepareSpellScript(spell_taldaram_glittering_sparks_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1400,7 +1400,7 @@ class spell_taldaram_summon_flame_ball : public SpellScriptLoader
 
         class spell_taldaram_summon_flame_ball_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_taldaram_summon_flame_ball_SpellScript);
+            PrepareSpellScript(spell_taldaram_summon_flame_ball_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1427,7 +1427,7 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader
 
         class spell_flame_ball_visual_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_flame_ball_visual_AuraScript);
+            PrepareAuraScript(spell_flame_ball_visual_AuraScript)
 
             bool Load() override
             {
@@ -1471,7 +1471,7 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader
 
         class spell_taldaram_ball_of_inferno_flame_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_taldaram_ball_of_inferno_flame_SpellScript);
+            PrepareSpellScript(spell_taldaram_ball_of_inferno_flame_SpellScript)
 
             void ModAuraStack()
             {
@@ -1499,7 +1499,7 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader
 
         class spell_valanar_kinetic_bomb_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_valanar_kinetic_bomb_SpellScript);
+            PrepareSpellScript(spell_valanar_kinetic_bomb_SpellScript)
 
             void SetDest(SpellDestination& dest)
             {
@@ -1515,7 +1515,7 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader
 
         class spell_valanar_kinetic_bomb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_valanar_kinetic_bomb_AuraScript);
+            PrepareAuraScript(spell_valanar_kinetic_bomb_AuraScript)
 
             void HandleDummyTick(AuraEffect const* /*aurEff*/)
             {
@@ -1556,7 +1556,7 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScriptLoader
 
         class spell_valanar_kinetic_bomb_knockback_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_valanar_kinetic_bomb_knockback_SpellScript);
+            PrepareSpellScript(spell_valanar_kinetic_bomb_knockback_SpellScript)
 
             void KnockIntoAir()
             {
@@ -1583,7 +1583,7 @@ class spell_valanar_kinetic_bomb_absorb : public SpellScriptLoader
 
         class spell_valanar_kinetic_bomb_absorb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_valanar_kinetic_bomb_absorb_AuraScript);
+            PrepareAuraScript(spell_valanar_kinetic_bomb_absorb_AuraScript)
 
             void OnAbsorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount)
             {
@@ -1611,7 +1611,7 @@ class spell_blood_council_shadow_prison : public SpellScriptLoader
 
         class spell_blood_council_shadow_prison_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_blood_council_shadow_prison_AuraScript);
+            PrepareAuraScript(spell_blood_council_shadow_prison_AuraScript)
 
             void HandleDummyTick(AuraEffect const* aurEff)
             {
@@ -1638,7 +1638,7 @@ class spell_blood_council_shadow_prison_damage : public SpellScriptLoader
 
         class spell_blood_council_shadow_prison_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_blood_council_shadow_prison_SpellScript);
+            PrepareSpellScript(spell_blood_council_shadow_prison_SpellScript)
 
             void AddExtraDamage()
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 104a8357917..d7842b488cd 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -518,7 +518,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader
 
         class spell_blood_queen_vampiric_bite_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_blood_queen_vampiric_bite_SpellScript);
+            PrepareSpellScript(spell_blood_queen_vampiric_bite_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -595,7 +595,7 @@ class spell_blood_queen_frenzied_bloodthirst : public SpellScriptLoader
 
         class spell_blood_queen_frenzied_bloodthirst_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_blood_queen_frenzied_bloodthirst_AuraScript);
+            PrepareAuraScript(spell_blood_queen_frenzied_bloodthirst_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -654,7 +654,7 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader
 
         class spell_blood_queen_bloodbolt_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_blood_queen_bloodbolt_SpellScript);
+            PrepareSpellScript(spell_blood_queen_bloodbolt_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -705,7 +705,7 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader
 
         class spell_blood_queen_essence_of_the_blood_queen_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_blood_queen_essence_of_the_blood_queen_AuraScript);
+            PrepareAuraScript(spell_blood_queen_essence_of_the_blood_queen_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -740,7 +740,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader
 
         class spell_blood_queen_pact_of_the_darkfallen_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_SpellScript);
+            PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -788,7 +788,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader
 
         class spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript);
+            PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -826,7 +826,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo
 
         class spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript);
+            PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index 16d1531e890..ead6fc8ed47 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -1022,7 +1022,7 @@ class spell_deathbringer_blood_link : public SpellScriptLoader
 
         class spell_deathbringer_blood_link_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_deathbringer_blood_link_SpellScript);
+            PrepareSpellScript(spell_deathbringer_blood_link_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1058,7 +1058,7 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader
 
         class spell_deathbringer_blood_link_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_deathbringer_blood_link_AuraScript);
+            PrepareAuraScript(spell_deathbringer_blood_link_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1094,7 +1094,7 @@ class spell_deathbringer_blood_power : public SpellScriptLoader
 
         class spell_deathbringer_blood_power_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_deathbringer_blood_power_SpellScript);
+            PrepareSpellScript(spell_deathbringer_blood_power_SpellScript)
 
             void ModAuraValue()
             {
@@ -1110,7 +1110,7 @@ class spell_deathbringer_blood_power : public SpellScriptLoader
 
         class spell_deathbringer_blood_power_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_deathbringer_blood_power_AuraScript);
+            PrepareAuraScript(spell_deathbringer_blood_power_AuraScript)
 
             void RecalculateHook(AuraEffect const* /*aurEffect*/, int32& amount, bool& canBeRecalculated)
             {
@@ -1143,7 +1143,7 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader
 
         class spell_deathbringer_rune_of_blood_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_deathbringer_rune_of_blood_SpellScript);
+            PrepareSpellScript(spell_deathbringer_rune_of_blood_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1178,7 +1178,7 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader
 
         class spell_deathbringer_blood_nova_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_deathbringer_blood_nova_SpellScript);
+            PrepareSpellScript(spell_deathbringer_blood_nova_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1213,7 +1213,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader
 
         class spell_deathbringer_blood_nova_targeting_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_deathbringer_blood_nova_targeting_SpellScript);
+            PrepareSpellScript(spell_deathbringer_blood_nova_targeting_SpellScript)
 
             bool Load() override
             {
@@ -1292,7 +1292,7 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader
 
         class spell_deathbringer_boiling_blood_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_deathbringer_boiling_blood_SpellScript);
+            PrepareSpellScript(spell_deathbringer_boiling_blood_SpellScript)
 
             bool Load() override
             {
@@ -1329,7 +1329,7 @@ class spell_deathbringer_remove_marks : public SpellScriptLoader
 
         class spell_deathbringer_remove_marks_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_deathbringer_remove_marks_SpellScript);
+            PrepareSpellScript(spell_deathbringer_remove_marks_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index 9847d7191c6..2e61793745c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -368,7 +368,7 @@ class spell_festergut_pungent_blight : public SpellScriptLoader
 
         class spell_festergut_pungent_blight_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_festergut_pungent_blight_SpellScript);
+            PrepareSpellScript(spell_festergut_pungent_blight_SpellScript)
 
             bool Load() override
             {
@@ -404,7 +404,7 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader
 
         class spell_festergut_gastric_bloat_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_festergut_gastric_bloat_SpellScript);
+            PrepareSpellScript(spell_festergut_gastric_bloat_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -442,7 +442,7 @@ class spell_festergut_blighted_spores : public SpellScriptLoader
 
         class spell_festergut_blighted_spores_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_festergut_blighted_spores_AuraScript);
+            PrepareAuraScript(spell_festergut_blighted_spores_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index c0c909e4878..809270bd59c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -1824,7 +1824,7 @@ class spell_igb_rocket_pack : public SpellScriptLoader
 
         class spell_igb_rocket_pack_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_igb_rocket_pack_AuraScript);
+            PrepareAuraScript(spell_igb_rocket_pack_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1868,7 +1868,7 @@ class spell_igb_rocket_pack_useable : public SpellScriptLoader
 
         class spell_igb_rocket_pack_useable_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_igb_rocket_pack_useable_AuraScript);
+            PrepareAuraScript(spell_igb_rocket_pack_useable_AuraScript)
 
             bool Load()
             {
@@ -1917,7 +1917,7 @@ class spell_igb_on_gunship_deck : public SpellScriptLoader
 
         class spell_igb_on_gunship_deck_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_igb_on_gunship_deck_AuraScript);
+            PrepareAuraScript(spell_igb_on_gunship_deck_AuraScript)
 
             bool Load() override
             {
@@ -1962,7 +1962,7 @@ class spell_igb_periodic_trigger_with_power_cost : public SpellScriptLoader
 
         class spell_igb_periodic_trigger_with_power_cost_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_igb_periodic_trigger_with_power_cost_AuraScript);
+            PrepareAuraScript(spell_igb_periodic_trigger_with_power_cost_AuraScript)
 
             void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
             {
@@ -1989,7 +1989,7 @@ class spell_igb_cannon_blast : public SpellScriptLoader
 
         class spell_igb_cannon_blast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_cannon_blast_SpellScript);
+            PrepareSpellScript(spell_igb_cannon_blast_SpellScript)
 
             bool Load()
             {
@@ -2026,7 +2026,7 @@ class spell_igb_incinerating_blast : public SpellScriptLoader
 
         class spell_igb_incinerating_blast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_incinerating_blast_SpellScript);
+            PrepareSpellScript(spell_igb_incinerating_blast_SpellScript)
 
             void StoreEnergy()
             {
@@ -2066,7 +2066,7 @@ class spell_igb_overheat : public SpellScriptLoader
 
         class spell_igb_overheat_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_igb_overheat_AuraScript);
+            PrepareAuraScript(spell_igb_overheat_AuraScript)
 
             bool Load() override
             {
@@ -2122,7 +2122,7 @@ class spell_igb_below_zero : public SpellScriptLoader
 
         class spell_igb_below_zero_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_below_zero_SpellScript);
+            PrepareSpellScript(spell_igb_below_zero_SpellScript)
 
             void RemovePassengers()
             {
@@ -2148,7 +2148,7 @@ class spell_igb_teleport_to_enemy_ship : public SpellScriptLoader
 
         class spell_igb_teleport_to_enemy_ship_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_teleport_to_enemy_ship_SpellScript);
+            PrepareSpellScript(spell_igb_teleport_to_enemy_ship_SpellScript)
 
             void RelocateTransportOffset(SpellEffIndex /*effIndex*/)
             {
@@ -2182,7 +2182,7 @@ class spell_igb_burning_pitch_selector : public SpellScriptLoader
 
         class spell_igb_burning_pitch_selector_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_burning_pitch_selector_SpellScript);
+            PrepareSpellScript(spell_igb_burning_pitch_selector_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -2231,7 +2231,7 @@ class spell_igb_burning_pitch : public SpellScriptLoader
 
         class spell_igb_burning_pitch_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_burning_pitch_SpellScript);
+            PrepareSpellScript(spell_igb_burning_pitch_SpellScript)
 
             void HandleDummy(SpellEffIndex effIndex)
             {
@@ -2259,7 +2259,7 @@ class spell_igb_rocket_artillery : public SpellScriptLoader
 
         class spell_igb_rocket_artillery_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_rocket_artillery_SpellScript);
+            PrepareSpellScript(spell_igb_rocket_artillery_SpellScript)
 
             void SelectRandomTarget(std::list<WorldObject*>& targets)
             {
@@ -2297,7 +2297,7 @@ class spell_igb_rocket_artillery_explosion : public SpellScriptLoader
 
         class spell_igb_rocket_artillery_explosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_rocket_artillery_explosion_SpellScript);
+            PrepareSpellScript(spell_igb_rocket_artillery_explosion_SpellScript)
 
             void DamageGunship(SpellEffIndex /*effIndex*/)
             {
@@ -2324,7 +2324,7 @@ class spell_igb_gunship_fall_teleport : public SpellScriptLoader
 
         class spell_igb_gunship_fall_teleport_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_gunship_fall_teleport_SpellScript);
+            PrepareSpellScript(spell_igb_gunship_fall_teleport_SpellScript)
 
             bool Load()
             {
@@ -2365,7 +2365,7 @@ class spell_igb_check_for_players : public SpellScriptLoader
 
         class spell_igb_check_for_players_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_check_for_players_SpellScript);
+            PrepareSpellScript(spell_igb_check_for_players_SpellScript)
 
             bool Load() override
             {
@@ -2413,7 +2413,7 @@ class spell_igb_teleport_players_on_victory : public SpellScriptLoader
 
         class spell_igb_teleport_players_on_victory_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_igb_teleport_players_on_victory_SpellScript);
+            PrepareSpellScript(spell_igb_teleport_players_on_victory_SpellScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index d59e723d070..34b8901a304 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -956,7 +956,7 @@ class spell_deathwhisper_mana_barrier : public SpellScriptLoader
 
         class spell_deathwhisper_mana_barrier_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_deathwhisper_mana_barrier_AuraScript);
+            PrepareAuraScript(spell_deathwhisper_mana_barrier_AuraScript)
 
             void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
             {
@@ -988,7 +988,7 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader
 
         class spell_cultist_dark_martyrdom_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_cultist_dark_martyrdom_SpellScript);
+            PrepareSpellScript(spell_cultist_dark_martyrdom_SpellScript)
 
             void HandleEffect(SpellEffIndex /*effIndex*/)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index 5022cd4f645..b0907fd6865 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -499,7 +499,7 @@ class spell_marrowgar_coldflame : public SpellScriptLoader
 
         class spell_marrowgar_coldflame_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_marrowgar_coldflame_SpellScript);
+            PrepareSpellScript(spell_marrowgar_coldflame_SpellScript)
 
             void SelectTarget(std::list<WorldObject*>& targets)
             {
@@ -541,7 +541,7 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScriptLoader
 
         class spell_marrowgar_coldflame_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_marrowgar_coldflame_SpellScript);
+            PrepareSpellScript(spell_marrowgar_coldflame_SpellScript)
 
             void HandleScriptEffect(SpellEffIndex effIndex)
             {
@@ -569,7 +569,7 @@ class spell_marrowgar_coldflame_damage : public SpellScriptLoader
 
         class spell_marrowgar_coldflame_damage_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_marrowgar_coldflame_damage_AuraScript);
+            PrepareAuraScript(spell_marrowgar_coldflame_damage_AuraScript)
 
             bool CanBeAppliedOn(Unit* target)
             {
@@ -605,7 +605,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader
 
         class spell_marrowgar_bone_spike_graveyard_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_marrowgar_bone_spike_graveyard_SpellScript);
+            PrepareSpellScript(spell_marrowgar_bone_spike_graveyard_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -670,7 +670,7 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader
 
         class spell_marrowgar_bone_storm_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_marrowgar_bone_storm_SpellScript);
+            PrepareSpellScript(spell_marrowgar_bone_storm_SpellScript)
 
             void RecalculateDamage()
             {
@@ -696,7 +696,7 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader
 
         class spell_marrowgar_bone_slice_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_marrowgar_bone_slice_SpellScript);
+            PrepareSpellScript(spell_marrowgar_bone_slice_SpellScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index c408c486b30..dd5e55b9e26 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -823,7 +823,7 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader
 
         class spell_putricide_gaseous_bloat_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_putricide_gaseous_bloat_AuraScript);
+            PrepareAuraScript(spell_putricide_gaseous_bloat_AuraScript)
 
             void HandleExtraEffect(AuraEffect const* /*aurEff*/)
             {
@@ -855,7 +855,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader
 
         class spell_putricide_ooze_channel_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_ooze_channel_SpellScript);
+            PrepareSpellScript(spell_putricide_ooze_channel_SpellScript)
 
             bool Validate(SpellInfo const* spell) override
             {
@@ -943,7 +943,7 @@ class spell_putricide_slime_puddle : public SpellScriptLoader
 
         class spell_putricide_slime_puddle_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_slime_puddle_SpellScript);
+            PrepareSpellScript(spell_putricide_slime_puddle_SpellScript)
 
             void ScaleRange(std::list<WorldObject*>& targets)
             {
@@ -971,7 +971,7 @@ class spell_putricide_slime_puddle_aura : public SpellScriptLoader
 
         class spell_putricide_slime_puddle_aura_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_slime_puddle_aura_SpellScript);
+            PrepareSpellScript(spell_putricide_slime_puddle_aura_SpellScript)
 
             void ReplaceAura()
             {
@@ -998,7 +998,7 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader
 
         class spell_putricide_unstable_experiment_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_unstable_experiment_SpellScript);
+            PrepareSpellScript(spell_putricide_unstable_experiment_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1046,7 +1046,7 @@ class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader
 
         class spell_putricide_ooze_eruption_searcher_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_ooze_eruption_searcher_SpellScript);
+            PrepareSpellScript(spell_putricide_ooze_eruption_searcher_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -1077,7 +1077,7 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader
 
         class spell_putricide_choking_gas_bomb_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_choking_gas_bomb_SpellScript);
+            PrepareSpellScript(spell_putricide_choking_gas_bomb_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1111,7 +1111,7 @@ class spell_putricide_unbound_plague : public SpellScriptLoader
 
         class spell_putricide_unbound_plague_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_unbound_plague_SpellScript);
+            PrepareSpellScript(spell_putricide_unbound_plague_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1190,7 +1190,7 @@ class spell_putricide_eat_ooze : public SpellScriptLoader
 
         class spell_putricide_eat_ooze_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_eat_ooze_SpellScript);
+            PrepareSpellScript(spell_putricide_eat_ooze_SpellScript)
 
             void SelectTarget(std::list<WorldObject*>& targets)
             {
@@ -1242,7 +1242,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader
 
         class spell_putricide_mutated_plague_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_putricide_mutated_plague_AuraScript);
+            PrepareAuraScript(spell_putricide_mutated_plague_AuraScript)
 
             void HandleTriggerSpell(AuraEffect const* aurEff)
             {
@@ -1292,7 +1292,7 @@ class spell_putricide_mutation_init : public SpellScriptLoader
 
         class spell_putricide_mutation_init_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_mutation_init_SpellScript);
+            PrepareSpellScript(spell_putricide_mutation_init_SpellScript)
 
             SpellCastResult CheckRequirementInternal(SpellCustomErrors& extendedError)
             {
@@ -1346,7 +1346,7 @@ class spell_putricide_mutation_init : public SpellScriptLoader
 
         class spell_putricide_mutation_init_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_putricide_mutation_init_AuraScript);
+            PrepareAuraScript(spell_putricide_mutation_init_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -1381,7 +1381,7 @@ class spell_putricide_mutated_transformation_dismiss : public SpellScriptLoader
 
         class spell_putricide_mutated_transformation_dismiss_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_putricide_mutated_transformation_dismiss_AuraScript);
+            PrepareAuraScript(spell_putricide_mutated_transformation_dismiss_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -1408,7 +1408,7 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader
 
         class spell_putricide_mutated_transformation_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_mutated_transformation_SpellScript);
+            PrepareSpellScript(spell_putricide_mutated_transformation_SpellScript)
 
             void HandleSummon(SpellEffIndex effIndex)
             {
@@ -1469,7 +1469,7 @@ class spell_putricide_mutated_transformation_dmg : public SpellScriptLoader
 
         class spell_putricide_mutated_transformation_dmg_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_mutated_transformation_dmg_SpellScript);
+            PrepareSpellScript(spell_putricide_mutated_transformation_dmg_SpellScript)
 
             void FilterTargetsInitial(std::list<WorldObject*>& targets)
             {
@@ -1496,7 +1496,7 @@ class spell_putricide_regurgitated_ooze : public SpellScriptLoader
 
         class spell_putricide_regurgitated_ooze_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_regurgitated_ooze_SpellScript);
+            PrepareSpellScript(spell_putricide_regurgitated_ooze_SpellScript)
 
             // the only purpose of this hook is to fail the achievement
             void ExtraEffect(SpellEffIndex /*effIndex*/)
@@ -1525,7 +1525,7 @@ class spell_putricide_clear_aura_effect_value : public SpellScriptLoader
 
         class spell_putricide_clear_aura_effect_value_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_putricide_clear_aura_effect_value_SpellScript);
+            PrepareSpellScript(spell_putricide_clear_aura_effect_value_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1554,7 +1554,7 @@ class spell_stinky_precious_decimate : public SpellScriptLoader
 
         class spell_stinky_precious_decimate_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_stinky_precious_decimate_SpellScript);
+            PrepareSpellScript(spell_stinky_precious_decimate_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index 8766781de7c..a3407a0ff1c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -455,7 +455,7 @@ class spell_rotface_ooze_flood : public SpellScriptLoader
 
         class spell_rotface_ooze_flood_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_ooze_flood_SpellScript);
+            PrepareSpellScript(spell_rotface_ooze_flood_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -505,7 +505,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader
 
         class spell_rotface_mutated_infection_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_mutated_infection_SpellScript);
+            PrepareSpellScript(spell_rotface_mutated_infection_SpellScript)
 
             bool Load() override
             {
@@ -565,7 +565,7 @@ class spell_rotface_little_ooze_combine : public SpellScriptLoader
 
         class spell_rotface_little_ooze_combine_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_little_ooze_combine_SpellScript);
+            PrepareSpellScript(spell_rotface_little_ooze_combine_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -597,7 +597,7 @@ class spell_rotface_large_ooze_combine : public SpellScriptLoader
 
         class spell_rotface_large_ooze_combine_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_large_ooze_combine_SpellScript);
+            PrepareSpellScript(spell_rotface_large_ooze_combine_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -639,7 +639,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader
 
         class spell_rotface_large_ooze_buff_combine_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_large_ooze_buff_combine_SpellScript);
+            PrepareSpellScript(spell_rotface_large_ooze_buff_combine_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -694,7 +694,7 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader
 
         class spell_rotface_unstable_ooze_explosion_init_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init_SpellScript);
+            PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -734,7 +734,7 @@ class spell_rotface_unstable_ooze_explosion : public SpellScriptLoader
 
         class spell_rotface_unstable_ooze_explosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_unstable_ooze_explosion_SpellScript);
+            PrepareSpellScript(spell_rotface_unstable_ooze_explosion_SpellScript)
 
             void CheckTarget(SpellEffIndex effIndex)
             {
@@ -771,7 +771,7 @@ class spell_rotface_unstable_ooze_explosion_suicide : public SpellScriptLoader
 
         class spell_rotface_unstable_ooze_explosion_suicide_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rotface_unstable_ooze_explosion_suicide_AuraScript);
+            PrepareAuraScript(spell_rotface_unstable_ooze_explosion_suicide_AuraScript)
 
             void DespawnSelf(AuraEffect const* /*aurEff*/)
             {
@@ -804,7 +804,7 @@ class spell_rotface_vile_gas_trigger : public SpellScriptLoader
 
         class spell_rotface_vile_gas_trigger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rotface_vile_gas_trigger_SpellScript);
+            PrepareSpellScript(spell_rotface_vile_gas_trigger_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 76c5a93f9c5..f8c042be1eb 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -1023,7 +1023,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader
 
         class spell_sindragosa_s_fury_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sindragosa_s_fury_SpellScript);
+            PrepareSpellScript(spell_sindragosa_s_fury_SpellScript)
 
             bool Load() override
             {
@@ -1110,7 +1110,7 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader
 
         class spell_sindragosa_unchained_magic_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sindragosa_unchained_magic_SpellScript);
+            PrepareSpellScript(spell_sindragosa_unchained_magic_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -1139,7 +1139,7 @@ class spell_sindragosa_frost_breath : public SpellScriptLoader
 
         class spell_sindragosa_frost_breath_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sindragosa_frost_breath_SpellScript);
+            PrepareSpellScript(spell_sindragosa_frost_breath_SpellScript)
 
             void HandleInfusion()
             {
@@ -1184,7 +1184,7 @@ class spell_sindragosa_instability : public SpellScriptLoader
 
         class spell_sindragosa_instability_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sindragosa_instability_AuraScript);
+            PrepareAuraScript(spell_sindragosa_instability_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1218,7 +1218,7 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader
 
         class spell_sindragosa_frost_beacon_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sindragosa_frost_beacon_AuraScript);
+            PrepareAuraScript(spell_sindragosa_frost_beacon_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1253,7 +1253,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader
 
         class spell_sindragosa_ice_tomb_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sindragosa_ice_tomb_SpellScript);
+            PrepareSpellScript(spell_sindragosa_ice_tomb_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1286,7 +1286,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader
 
         class spell_sindragosa_ice_tomb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sindragosa_ice_tomb_AuraScript);
+            PrepareAuraScript(spell_sindragosa_ice_tomb_AuraScript)
 
             void PeriodicTick(AuraEffect const* /*aurEff*/)
             {
@@ -1317,7 +1317,7 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader
 
         class spell_sindragosa_icy_grip_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sindragosa_icy_grip_SpellScript);
+            PrepareSpellScript(spell_sindragosa_icy_grip_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1365,7 +1365,7 @@ class spell_sindragosa_mystic_buffet : public SpellScriptLoader
 
         class spell_sindragosa_mystic_buffet_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sindragosa_mystic_buffet_SpellScript);
+            PrepareSpellScript(spell_sindragosa_mystic_buffet_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -1391,7 +1391,7 @@ class spell_rimefang_icy_blast : public SpellScriptLoader
 
         class spell_rimefang_icy_blast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rimefang_icy_blast_SpellScript);
+            PrepareSpellScript(spell_rimefang_icy_blast_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1443,7 +1443,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader
 
         class spell_frostwarden_handler_order_whelp_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_frostwarden_handler_order_whelp_SpellScript);
+            PrepareSpellScript(spell_frostwarden_handler_order_whelp_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1498,7 +1498,7 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader
 
         class spell_frostwarden_handler_focus_fire_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_frostwarden_handler_focus_fire_SpellScript);
+            PrepareSpellScript(spell_frostwarden_handler_focus_fire_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1515,7 +1515,7 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader
 
         class spell_frostwarden_handler_focus_fire_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_frostwarden_handler_focus_fire_AuraScript);
+            PrepareAuraScript(spell_frostwarden_handler_focus_fire_AuraScript)
 
             void PeriodicTick(AuraEffect const* /*aurEff*/)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index 223f3731032..6a32517d93b 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -2005,7 +2005,7 @@ class spell_the_lich_king_infest : public SpellScriptLoader
 
         class spell_the_lich_king_infest_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_infest_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_infest_AuraScript)
 
             void OnPeriodic(AuraEffect const* /*aurEff*/)
             {
@@ -2045,7 +2045,7 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader
 
         class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2093,7 +2093,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader
 
         class spell_the_lich_king_necrotic_plague_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_necrotic_plague_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_necrotic_plague_SpellScript)
 
             bool Load() override
             {
@@ -2133,7 +2133,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader
 
         class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript)
 
             bool Load() override
             {
@@ -2217,7 +2217,7 @@ class spell_the_lich_king_shadow_trap_visual : public SpellScriptLoader
 
         class spell_the_lich_king_shadow_trap_visual_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_shadow_trap_visual_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_shadow_trap_visual_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -2244,7 +2244,7 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScriptLoader
 
         class spell_the_lich_king_shadow_trap_periodic_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_shadow_trap_periodic_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_shadow_trap_periodic_SpellScript)
 
             void CheckTargetCount(std::list<WorldObject*>& targets)
             {
@@ -2273,7 +2273,7 @@ class spell_the_lich_king_quake : public SpellScriptLoader
 
         class spell_the_lich_king_quake_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_quake_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_quake_SpellScript)
 
             bool Load() override
             {
@@ -2312,7 +2312,7 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader
 
         class spell_the_lich_king_ice_burst_target_search_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_ice_burst_target_search_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_ice_burst_target_search_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2355,7 +2355,7 @@ class spell_the_lich_king_raging_spirit : public SpellScriptLoader
 
         class spell_the_lich_king_raging_spirit_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_raging_spirit_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_raging_spirit_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2404,7 +2404,7 @@ class spell_the_lich_king_defile : public SpellScriptLoader
 
         class spell_the_lich_king_defile_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_defile_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_defile_SpellScript)
 
             void CorrectRange(std::list<WorldObject*>& targets)
             {
@@ -2441,7 +2441,7 @@ class spell_the_lich_king_summon_into_air : public SpellScriptLoader
 
         class spell_the_lich_king_summon_into_air_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_summon_into_air_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_summon_into_air_SpellScript)
 
             void ModDestHeight(SpellEffIndex effIndex)
             {
@@ -2476,7 +2476,7 @@ class spell_the_lich_king_soul_reaper : public SpellScriptLoader
 
         class spell_the_lich_king_soul_reaper_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_soul_reaper_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_soul_reaper_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2510,7 +2510,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader
 
         class spell_the_lich_king_valkyr_target_search_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2576,7 +2576,7 @@ class spell_the_lich_king_cast_back_to_caster : public SpellScriptLoader
 
         class spell_the_lich_king_cast_back_to_caster_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_cast_back_to_caster_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_cast_back_to_caster_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2602,7 +2602,7 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader
 
         class spell_the_lich_king_life_siphon_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_life_siphon_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_life_siphon_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2635,7 +2635,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader
 
         class spell_the_lich_king_vile_spirits_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_vile_spirits_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_vile_spirits_AuraScript)
 
             bool Load() override
             {
@@ -2670,7 +2670,7 @@ class spell_the_lich_king_vile_spirits_visual : public SpellScriptLoader
 
         class spell_the_lich_king_vile_spirits_visual_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_vile_spirits_visual_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_vile_spirits_visual_SpellScript)
 
             void ModDestHeight(SpellEffIndex /*effIndex*/)
             {
@@ -2697,7 +2697,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa
 
         class spell_the_lich_king_vile_spirit_move_target_search_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search_SpellScript)
 
             bool Load() override
             {
@@ -2746,7 +2746,7 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL
 
         class spell_the_lich_king_vile_spirit_damage_target_search_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript)
 
             bool Load() override
             {
@@ -2787,7 +2787,7 @@ class spell_the_lich_king_harvest_soul : public SpellScriptLoader
 
         class spell_the_lich_king_harvest_soul_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_harvest_soul_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_harvest_soul_AuraScript)
 
             bool Load() override
             {
@@ -2820,7 +2820,7 @@ class spell_the_lich_king_lights_favor : public SpellScriptLoader
 
         class spell_the_lich_king_lights_favor_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_lights_favor_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_lights_favor_AuraScript)
 
             void OnPeriodic(AuraEffect const* /*aurEff*/)
             {
@@ -2857,7 +2857,7 @@ class spell_the_lich_king_soul_rip : public SpellScriptLoader
 
         class spell_the_lich_king_soul_rip_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_soul_rip_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_soul_rip_AuraScript)
 
             void OnPeriodic(AuraEffect const* aurEff)
             {
@@ -2886,7 +2886,7 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader
 
         class spell_the_lich_king_restore_soul_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_restore_soul_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_restore_soul_SpellScript)
 
             bool Load() override
             {
@@ -2939,7 +2939,7 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader
 
         class spell_the_lich_king_dark_hunger_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_dark_hunger_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_dark_hunger_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2974,7 +2974,7 @@ class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader
 
         class spell_the_lich_king_in_frostmourne_room_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_the_lich_king_in_frostmourne_room_AuraScript);
+            PrepareAuraScript(spell_the_lich_king_in_frostmourne_room_AuraScript)
 
             bool Load() override
             {
@@ -3007,7 +3007,7 @@ class spell_the_lich_king_summon_spirit_bomb : public SpellScriptLoader
 
         class spell_the_lich_king_summon_spirit_bomb_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_summon_spirit_bomb_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_summon_spirit_bomb_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -3034,7 +3034,7 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader
 
         class spell_the_lich_king_trigger_vile_spirit_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit_SpellScript)
 
             void ActivateSpirit()
             {
@@ -3064,7 +3064,7 @@ class spell_the_lich_king_jump : public SpellScriptLoader
 
         class spell_the_lich_king_jump_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_jump_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_jump_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -3094,7 +3094,7 @@ class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader
 
         class spell_the_lich_king_jump_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_jump_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_jump_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -3121,7 +3121,7 @@ class spell_the_lich_king_play_movie : public SpellScriptLoader
 
         class spell_the_lich_king_play_movie_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_the_lich_king_play_movie_SpellScript);
+            PrepareSpellScript(spell_the_lich_king_play_movie_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index 0c504842c08..31542a9122a 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -1113,7 +1113,7 @@ class spell_dreamwalker_mana_void : public SpellScriptLoader
 
         class spell_dreamwalker_mana_void_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dreamwalker_mana_void_AuraScript);
+            PrepareAuraScript(spell_dreamwalker_mana_void_AuraScript)
 
             void PeriodicTick(AuraEffect const* aurEff)
             {
@@ -1143,7 +1143,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader
 
         class spell_dreamwalker_decay_periodic_timer_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dreamwalker_decay_periodic_timer_AuraScript);
+            PrepareAuraScript(spell_dreamwalker_decay_periodic_timer_AuraScript)
 
             bool Load() override
             {
@@ -1181,7 +1181,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader
 
         class spell_dreamwalker_summoner_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dreamwalker_summoner_SpellScript);
+            PrepareSpellScript(spell_dreamwalker_summoner_SpellScript)
 
             bool Load() override
             {
@@ -1230,7 +1230,7 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader
 
         class spell_dreamwalker_summon_suppresser_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dreamwalker_summon_suppresser_AuraScript);
+            PrepareAuraScript(spell_dreamwalker_summon_suppresser_AuraScript)
 
             void PeriodicTick(AuraEffect const* /*aurEff*/)
             {
@@ -1271,7 +1271,7 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScriptLoader
 
         class spell_dreamwalker_summon_suppresser_effect_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect_SpellScript);
+            PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect_SpellScript)
 
             bool Load() override
             {
@@ -1308,7 +1308,7 @@ class spell_dreamwalker_summon_dream_portal : public SpellScriptLoader
 
         class spell_dreamwalker_summon_dream_portal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dreamwalker_summon_dream_portal_SpellScript);
+            PrepareSpellScript(spell_dreamwalker_summon_dream_portal_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1339,7 +1339,7 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScriptLoader
 
         class spell_dreamwalker_summon_nightmare_portal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dreamwalker_summon_nightmare_portal_SpellScript);
+            PrepareSpellScript(spell_dreamwalker_summon_nightmare_portal_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1370,7 +1370,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader
 
         class spell_dreamwalker_nightmare_cloud_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dreamwalker_nightmare_cloud_AuraScript);
+            PrepareAuraScript(spell_dreamwalker_nightmare_cloud_AuraScript)
 
             bool Load() override
             {
@@ -1405,7 +1405,7 @@ class spell_dreamwalker_twisted_nightmares : public SpellScriptLoader
 
         class spell_dreamwalker_twisted_nightmares_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dreamwalker_twisted_nightmares_SpellScript);
+            PrepareSpellScript(spell_dreamwalker_twisted_nightmares_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 592c44940a4..96271872f87 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -1733,7 +1733,7 @@ class spell_icc_stoneform : public SpellScriptLoader
 
         class spell_icc_stoneform_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_icc_stoneform_AuraScript);
+            PrepareAuraScript(spell_icc_stoneform_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -1775,7 +1775,7 @@ class spell_icc_sprit_alarm : public SpellScriptLoader
 
         class spell_icc_sprit_alarm_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_icc_sprit_alarm_SpellScript);
+            PrepareSpellScript(spell_icc_sprit_alarm_SpellScript)
 
             void HandleEvent(SpellEffIndex effIndex)
             {
@@ -1860,7 +1860,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader
 
         class spell_frost_giant_death_plague_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_frost_giant_death_plague_SpellScript);
+            PrepareSpellScript(spell_frost_giant_death_plague_SpellScript)
 
             bool Load() override
             {
@@ -1922,7 +1922,7 @@ class spell_icc_harvest_blight_specimen : public SpellScriptLoader
 
         class spell_icc_harvest_blight_specimen_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_icc_harvest_blight_specimen_SpellScript);
+            PrepareSpellScript(spell_icc_harvest_blight_specimen_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1966,7 +1966,7 @@ class spell_svalna_revive_champion : public SpellScriptLoader
 
         class spell_svalna_revive_champion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_svalna_revive_champion_SpellScript);
+            PrepareSpellScript(spell_svalna_revive_champion_SpellScript)
 
             void RemoveAliveTarget(std::list<WorldObject*>& targets)
             {
@@ -2007,7 +2007,7 @@ class spell_svalna_remove_spear : public SpellScriptLoader
 
         class spell_svalna_remove_spear_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_svalna_remove_spear_SpellScript);
+            PrepareSpellScript(spell_svalna_remove_spear_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -2040,7 +2040,7 @@ class spell_icc_soul_missile : public SpellScriptLoader
 
         class spell_icc_soul_missile_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_icc_soul_missile_SpellScript);
+            PrepareSpellScript(spell_icc_soul_missile_SpellScript)
 
             void RelocateDest(SpellDestination& dest)
             {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
index 7b00f2f19d7..fa535619e41 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
@@ -518,7 +518,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader
 
         class spell_trigger_spell_from_caster_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_trigger_spell_from_caster_SpellScript);
+            PrepareSpellScript(spell_trigger_spell_from_caster_SpellScript)
 
         public:
             spell_trigger_spell_from_caster_SpellScript(uint32 triggerId) : SpellScript(), _triggerId(triggerId) { }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index 0543b0274b5..4f66cad51a5 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -395,7 +395,7 @@ class spell_four_horsemen_mark : public SpellScriptLoader
 
         class spell_four_horsemen_mark_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_four_horsemen_mark_AuraScript);
+            PrepareAuraScript(spell_four_horsemen_mark_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index 29e435e2127..67eb2284cfc 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -595,7 +595,7 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader
 
         class spell_gothik_shadow_bolt_volley_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gothik_shadow_bolt_volley_SpellScript);
+            PrepareSpellScript(spell_gothik_shadow_bolt_volley_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index 929c52a986c..03c09c8d02b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -147,7 +147,7 @@ class spell_grobbulus_mutating_injection : public SpellScriptLoader
 
         class spell_grobbulus_mutating_injection_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_grobbulus_mutating_injection_AuraScript);
+            PrepareAuraScript(spell_grobbulus_mutating_injection_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -190,7 +190,7 @@ class spell_grobbulus_poison_cloud : public SpellScriptLoader
 
         class spell_grobbulus_poison_cloud_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_grobbulus_poison_cloud_AuraScript);
+            PrepareAuraScript(spell_grobbulus_poison_cloud_AuraScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index 48dc889ef2b..f2d702a762f 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -188,7 +188,7 @@ class spell_heigan_eruption : public SpellScriptLoader
 
         class spell_heigan_eruption_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_heigan_eruption_SpellScript);
+            PrepareSpellScript(spell_heigan_eruption_SpellScript)
 
             void HandleScript(SpellEffIndex /*eff*/)
             {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 8b3ac64fb89..671cefdca0e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -754,7 +754,7 @@ class spell_kelthuzad_detonate_mana : public SpellScriptLoader
 
         class spell_kelthuzad_detonate_mana_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_kelthuzad_detonate_mana_AuraScript);
+            PrepareAuraScript(spell_kelthuzad_detonate_mana_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 946b60d4e27..bcd50390ff2 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -165,7 +165,7 @@ class spell_loatheb_necrotic_aura_warning : public SpellScriptLoader
 
         class spell_loatheb_necrotic_aura_warning_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_loatheb_necrotic_aura_warning_AuraScript);
+            PrepareAuraScript(spell_loatheb_necrotic_aura_warning_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 528b2fec348..b46d558021f 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -441,7 +441,7 @@ class spell_thaddius_pos_neg_charge : public SpellScriptLoader
 
         class spell_thaddius_pos_neg_charge_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thaddius_pos_neg_charge_SpellScript);
+            PrepareSpellScript(spell_thaddius_pos_neg_charge_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -520,7 +520,7 @@ class spell_thaddius_polarity_shift : public SpellScriptLoader
 
         class spell_thaddius_polarity_shift_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thaddius_polarity_shift_SpellScript);
+            PrepareSpellScript(spell_thaddius_polarity_shift_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 3f0fb2f93b1..f68fac638fa 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1647,7 +1647,7 @@ class spell_malygos_portal_beam : public SpellScriptLoader
 
         class spell_malygos_portal_beam_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_malygos_portal_beam_AuraScript);
+            PrepareAuraScript(spell_malygos_portal_beam_AuraScript)
 
             bool Load() override
             {
@@ -1694,7 +1694,7 @@ class spell_malygos_random_portal : public SpellScriptLoader
 
         class spell_malygos_random_portal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_malygos_random_portal_SpellScript);
+            PrepareSpellScript(spell_malygos_random_portal_SpellScript)
 
             bool Load() override
             {
@@ -1750,7 +1750,7 @@ class spell_malygos_arcane_storm : public SpellScriptLoader
 
         class spell_malygos_arcane_storm_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_malygos_arcane_storm_SpellScript);
+            PrepareSpellScript(spell_malygos_arcane_storm_SpellScript)
 
             bool Load() override
             {
@@ -1847,7 +1847,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader
 
         class spell_malygos_vortex_visual_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_malygos_vortex_visual_AuraScript);
+            PrepareAuraScript(spell_malygos_vortex_visual_AuraScript)
 
             bool Load() override
             {
@@ -1926,7 +1926,7 @@ class spell_arcane_overload : public SpellScriptLoader
 
         class spell_arcane_overload_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_arcane_overload_SpellScript);
+            PrepareSpellScript(spell_arcane_overload_SpellScript)
 
             bool Load() override
             {
@@ -1959,7 +1959,7 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader
 
         class spell_nexus_lord_align_disk_aggro_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_nexus_lord_align_disk_aggro_SpellScript);
+            PrepareSpellScript(spell_nexus_lord_align_disk_aggro_SpellScript)
 
             bool Load() override
             {
@@ -2010,7 +2010,7 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader
 
         class spell_scion_of_eternity_arcane_barrage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_scion_of_eternity_arcane_barrage_SpellScript);
+            PrepareSpellScript(spell_scion_of_eternity_arcane_barrage_SpellScript)
 
             bool Load() override
             {
@@ -2094,7 +2094,7 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader
 
         class spell_malygos_destroy_platform_channel_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_malygos_destroy_platform_channel_AuraScript);
+            PrepareAuraScript(spell_malygos_destroy_platform_channel_AuraScript)
 
             bool Load() override
             {
@@ -2136,7 +2136,7 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL
 
         class spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript);
+            PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript)
 
             bool Load() override
             {
@@ -2176,7 +2176,7 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader
 
         class spell_alexstrasza_bunny_destroy_platform_event_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_event_SpellScript);
+            PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_event_SpellScript)
 
             bool Load() override
             {
@@ -2217,7 +2217,7 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScriptLoader
 
         class spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript);
+            PrepareSpellScript(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript)
 
             bool Load() override
             {
@@ -2250,7 +2250,7 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript
 
         class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript);
+            PrepareSpellScript(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript)
 
             bool Load() override
             {
@@ -2399,7 +2399,7 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader
 
         class spell_alexstrasza_gift_beam_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_alexstrasza_gift_beam_AuraScript);
+            PrepareAuraScript(spell_alexstrasza_gift_beam_AuraScript)
 
             bool Load() override
             {
@@ -2446,7 +2446,7 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader
 
         class spell_alexstrasza_gift_beam_visual_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_alexstrasza_gift_beam_visual_AuraScript);
+            PrepareAuraScript(spell_alexstrasza_gift_beam_visual_AuraScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index 38e6a3fc816..6e36f95e03b 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -234,7 +234,7 @@ class spell_intense_cold : public SpellScriptLoader
 
         class spell_intense_cold_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_intense_cold_AuraScript);
+            PrepareAuraScript(spell_intense_cold_AuraScript)
 
             void HandlePeriodicTick(AuraEffect const* aurEff)
             {
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 222f0474c01..55f3b7b7315 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -263,7 +263,7 @@ class spell_crystal_spike : public SpellScriptLoader
 
         class spell_crystal_spike_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_crystal_spike_AuraScript);
+            PrepareAuraScript(spell_crystal_spike_AuraScript)
 
             void HandlePeriodic(AuraEffect const* /*aurEff*/)
             {
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index 3ae61bdd116..0c18984d970 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -258,7 +258,7 @@ class spell_eregos_planar_shift : public SpellScriptLoader
 
         class spell_eregos_planar_shift_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_eregos_planar_shift_AuraScript);
+            PrepareAuraScript(spell_eregos_planar_shift_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
index 0870614ba78..22e266a4cd1 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
@@ -249,7 +249,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader
 
         class spell_varos_centrifuge_shield_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_varos_centrifuge_shield_AuraScript);
+            PrepareAuraScript(spell_varos_centrifuge_shield_AuraScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
index 259d7faa6fe..875bd4e39cb 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
@@ -371,7 +371,7 @@ class spell_oculus_call_ruby_emerald_amber_drake : public SpellScriptLoader
 
         class spell_oculus_call_ruby_emerald_amber_drake_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_oculus_call_ruby_emerald_amber_drake_SpellScript);
+            PrepareSpellScript(spell_oculus_call_ruby_emerald_amber_drake_SpellScript)
 
             void SetDest(SpellDestination& dest)
             {
@@ -402,7 +402,7 @@ class spell_oculus_ride_ruby_emerald_amber_drake_que : public SpellScriptLoader
 
         class spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript);
+            PrepareAuraScript(spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript)
 
             void HandlePeriodic(AuraEffect const* aurEff)
             {
@@ -432,7 +432,7 @@ class spell_oculus_evasive_maneuvers : public SpellScriptLoader
 
         class spell_oculus_evasive_maneuvers_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_oculus_evasive_maneuvers_AuraScript);
+            PrepareAuraScript(spell_oculus_evasive_maneuvers_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -469,7 +469,7 @@ class spell_oculus_shock_lance : public SpellScriptLoader
 
         class spell_oculus_shock_lance_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_oculus_shock_lance_SpellScript);
+            PrepareSpellScript(spell_oculus_shock_lance_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -511,7 +511,7 @@ class spell_oculus_stop_time : public SpellScriptLoader
 
         class spell_oculus_stop_time_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_oculus_stop_time_AuraScript);
+            PrepareAuraScript(spell_oculus_stop_time_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -551,7 +551,7 @@ class spell_oculus_temporal_rift : public SpellScriptLoader
 
         class spell_oculus_temporal_rift_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_oculus_temporal_rift_AuraScript);
+            PrepareAuraScript(spell_oculus_temporal_rift_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -595,7 +595,7 @@ class spell_oculus_touch_the_nightmare : public SpellScriptLoader
 
         class spell_oculus_touch_the_nightmare_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_oculus_touch_the_nightmare_SpellScript);
+            PrepareSpellScript(spell_oculus_touch_the_nightmare_SpellScript)
 
             void HandleDamageCalc(SpellEffIndex /*effIndex*/)
             {
@@ -622,7 +622,7 @@ class spell_oculus_dream_funnel : public SpellScriptLoader
 
         class spell_oculus_dream_funnel_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_oculus_dream_funnel_AuraScript);
+            PrepareAuraScript(spell_oculus_dream_funnel_AuraScript)
 
             void HandleEffectCalcAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
             {
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 576fc4492f1..867944ca423 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -190,7 +190,7 @@ class spell_loken_pulsing_shockwave : public SpellScriptLoader
 
         class spell_loken_pulsing_shockwave_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_loken_pulsing_shockwave_SpellScript);
+            PrepareSpellScript(spell_loken_pulsing_shockwave_SpellScript)
 
             void CalculateDamage(SpellEffIndex /*effIndex*/)
             {
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index c81cd0b0b80..459f68d67ee 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -187,7 +187,7 @@ class spell_krystallus_shatter : public SpellScriptLoader
 
         class spell_krystallus_shatter_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_krystallus_shatter_SpellScript);
+            PrepareSpellScript(spell_krystallus_shatter_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -217,7 +217,7 @@ class spell_krystallus_shatter_effect : public SpellScriptLoader
 
         class spell_krystallus_shatter_effect_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_krystallus_shatter_effect_SpellScript);
+            PrepareSpellScript(spell_krystallus_shatter_effect_SpellScript)
 
             void CalculateDamage()
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
index 67500382758..f7af92172c1 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
@@ -1039,7 +1039,7 @@ class spell_algalon_phase_punch : public SpellScriptLoader
 
         class spell_algalon_phase_punch_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_algalon_phase_punch_AuraScript);
+            PrepareAuraScript(spell_algalon_phase_punch_AuraScript)
 
             void HandlePeriodic(AuraEffect const* /*aurEff*/)
             {
@@ -1093,7 +1093,7 @@ class spell_algalon_arcane_barrage : public SpellScriptLoader
 
         class spell_algalon_arcane_barrage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_algalon_arcane_barrage_SpellScript);
+            PrepareSpellScript(spell_algalon_arcane_barrage_SpellScript)
 
             void SelectTarget(std::list<WorldObject*>& targets)
             {
@@ -1128,7 +1128,7 @@ class spell_algalon_trigger_3_adds : public SpellScriptLoader
 
         class spell_algalon_trigger_3_adds_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_algalon_trigger_3_adds_SpellScript);
+            PrepareSpellScript(spell_algalon_trigger_3_adds_SpellScript)
 
             void SelectTarget(std::list<WorldObject*>& targets)
             {
@@ -1164,7 +1164,7 @@ class spell_algalon_collapse : public SpellScriptLoader
 
         class spell_algalon_collapse_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_algalon_collapse_AuraScript);
+            PrepareAuraScript(spell_algalon_collapse_AuraScript)
 
             void HandlePeriodic(AuraEffect const* /*aurEff*/)
             {
@@ -1191,7 +1191,7 @@ class spell_algalon_big_bang : public SpellScriptLoader
 
         class spell_algalon_big_bang_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_algalon_big_bang_SpellScript);
+            PrepareSpellScript(spell_algalon_big_bang_SpellScript)
 
             bool Load() override
             {
@@ -1232,7 +1232,7 @@ class spell_algalon_remove_phase : public SpellScriptLoader
 
         class spell_algalon_remove_phase_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_algalon_remove_phase_AuraScript);
+            PrepareAuraScript(spell_algalon_remove_phase_AuraScript)
 
             void HandlePeriodic(AuraEffect const* /*aurEff*/)
             {
@@ -1260,7 +1260,7 @@ class spell_algalon_cosmic_smash : public SpellScriptLoader
 
         class spell_algalon_cosmic_smash_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_algalon_cosmic_smash_SpellScript);
+            PrepareSpellScript(spell_algalon_cosmic_smash_SpellScript)
 
             void ModDestHeight(SpellDestination& dest)
             {
@@ -1287,7 +1287,7 @@ class spell_algalon_cosmic_smash_damage : public SpellScriptLoader
 
         class spell_algalon_cosmic_smash_damage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_algalon_cosmic_smash_damage_SpellScript);
+            PrepareSpellScript(spell_algalon_cosmic_smash_damage_SpellScript)
 
             void RecalculateDamage()
             {
@@ -1318,7 +1318,7 @@ class spell_algalon_supermassive_fail : public SpellScriptLoader
 
         class spell_algalon_supermassive_fail_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_algalon_supermassive_fail_SpellScript);
+            PrepareSpellScript(spell_algalon_supermassive_fail_SpellScript)
 
             void RecalculateDamage()
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
index 9a08f01c279..98e9b52524b 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
@@ -633,7 +633,7 @@ class spell_shield_of_runes : public SpellScriptLoader
 
         class spell_shield_of_runes_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_shield_of_runes_AuraScript);
+            PrepareAuraScript(spell_shield_of_runes_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -661,7 +661,7 @@ class spell_assembly_meltdown : public SpellScriptLoader
 
         class spell_assembly_meltdown_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_assembly_meltdown_SpellScript);
+            PrepareSpellScript(spell_assembly_meltdown_SpellScript)
 
             void HandleInstaKill(SpellEffIndex /*effIndex*/)
             {
@@ -689,7 +689,7 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader
 
         class spell_assembly_rune_of_summoning_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_assembly_rune_of_summoning_AuraScript);
+            PrepareAuraScript(spell_assembly_rune_of_summoning_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index f0b8e123c63..9a792e118ea 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -489,7 +489,7 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader
 
         class spell_auriaya_strenght_of_the_pack_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_auriaya_strenght_of_the_pack_SpellScript);
+            PrepareSpellScript(spell_auriaya_strenght_of_the_pack_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -515,7 +515,7 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader
 
         class spell_auriaya_sentinel_blast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_auriaya_sentinel_blast_SpellScript);
+            PrepareSpellScript(spell_auriaya_sentinel_blast_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index 52cda5148cf..6312523bb25 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -1458,7 +1458,7 @@ class spell_load_into_catapult : public SpellScriptLoader
 
         class spell_load_into_catapult_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_load_into_catapult_AuraScript);
+            PrepareAuraScript(spell_load_into_catapult_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -1503,7 +1503,7 @@ class spell_auto_repair : public SpellScriptLoader
 
         class spell_auto_repair_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_auto_repair_SpellScript);
+            PrepareSpellScript(spell_auto_repair_SpellScript)
 
             void CheckCooldownForTarget()
             {
@@ -1564,7 +1564,7 @@ class spell_systems_shutdown : public SpellScriptLoader
 
         class spell_systems_shutdown_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_systems_shutdown_AuraScript);
+            PrepareAuraScript(spell_systems_shutdown_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -1650,7 +1650,7 @@ class spell_pursue : public SpellScriptLoader
 
         class spell_pursue_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pursue_SpellScript);
+            PrepareSpellScript(spell_pursue_SpellScript)
 
             bool Load() override
             {
@@ -1722,7 +1722,7 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader
 
         class spell_vehicle_throw_passenger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_vehicle_throw_passenger_SpellScript);
+            PrepareSpellScript(spell_vehicle_throw_passenger_SpellScript)
             void HandleScript(SpellEffIndex effIndex)
             {
                 Spell* baseSpell = GetSpell();
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
index 57df8c76a56..8b81e8ef8f5 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
@@ -1533,7 +1533,7 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader
 
         class spell_freya_attuned_to_nature_dose_reduction_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_freya_attuned_to_nature_dose_reduction_SpellScript);
+            PrepareSpellScript(spell_freya_attuned_to_nature_dose_reduction_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1580,7 +1580,7 @@ class spell_freya_iron_roots : public SpellScriptLoader
 
         class spell_freya_iron_roots_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_freya_iron_roots_SpellScript);
+            PrepareSpellScript(spell_freya_iron_roots_SpellScript)
 
             void HandleSummon(SpellEffIndex effIndex)
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
index 58df31a4471..fbfcf442e42 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
@@ -450,7 +450,7 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader
 
         class spell_general_vezax_mark_of_the_faceless_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_general_vezax_mark_of_the_faceless_AuraScript);
+            PrepareAuraScript(spell_general_vezax_mark_of_the_faceless_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/)
             {
@@ -484,7 +484,7 @@ class spell_general_vezax_mark_of_the_faceless_leech : public SpellScriptLoader
 
         class spell_general_vezax_mark_of_the_faceless_leech_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_general_vezax_mark_of_the_faceless_leech_SpellScript);
+            PrepareSpellScript(spell_general_vezax_mark_of_the_faceless_leech_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -513,7 +513,7 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader
 
         class spell_general_vezax_saronite_vapors_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_general_vezax_saronite_vapors_AuraScript);
+            PrepareAuraScript(spell_general_vezax_saronite_vapors_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index 4d904b04618..464efba920c 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -921,7 +921,7 @@ class spell_biting_cold : public SpellScriptLoader
 
         class spell_biting_cold_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_biting_cold_AuraScript);
+            PrepareAuraScript(spell_biting_cold_AuraScript)
 
             void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
             {
@@ -977,7 +977,7 @@ public:
 
     class spell_biting_cold_dot_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_biting_cold_dot_AuraScript);
+        PrepareAuraScript(spell_biting_cold_dot_AuraScript)
 
         void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
         {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
index ef9bd9a8b12..68888e04b8f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
@@ -430,7 +430,7 @@ class spell_ignis_slag_pot : public SpellScriptLoader
 
         class spell_ignis_slag_pot_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ignis_slag_pot_AuraScript);
+            PrepareAuraScript(spell_ignis_slag_pot_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index e77350e2710..67ec9c55eb5 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -331,7 +331,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader
 
         class spell_ulduar_rubble_summonSpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_rubble_summonSpellScript);
+            PrepareSpellScript(spell_ulduar_rubble_summonSpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -385,7 +385,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader
 
         class spell_ulduar_stone_grip_cast_target_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_stone_grip_cast_target_SpellScript);
+            PrepareSpellScript(spell_ulduar_stone_grip_cast_target_SpellScript)
 
             bool Load() override
             {
@@ -445,7 +445,7 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader
 
         class spell_ulduar_cancel_stone_gripSpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_cancel_stone_gripSpellScript);
+            PrepareSpellScript(spell_ulduar_cancel_stone_gripSpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -485,7 +485,7 @@ class spell_ulduar_squeezed_lifeless : public SpellScriptLoader
 
         class spell_ulduar_squeezed_lifeless_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_squeezed_lifeless_SpellScript);
+            PrepareSpellScript(spell_ulduar_squeezed_lifeless_SpellScript)
 
             void HandleInstaKill(SpellEffIndex /*effIndex*/)
             {
@@ -523,7 +523,7 @@ class spell_ulduar_stone_grip_absorb : public SpellScriptLoader
 
         class spell_ulduar_stone_grip_absorb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ulduar_stone_grip_absorb_AuraScript);
+            PrepareAuraScript(spell_ulduar_stone_grip_absorb_AuraScript)
 
             //! This will be called when Right Arm (vehicle) has sustained a specific amount of damage depending on instance mode
             //! What we do here is remove all harmful aura's related and teleport to safe spot.
@@ -560,7 +560,7 @@ class spell_ulduar_stone_grip : public SpellScriptLoader
 
         class spell_ulduar_stone_grip_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ulduar_stone_grip_AuraScript);
+            PrepareAuraScript(spell_ulduar_stone_grip_AuraScript)
 
             void OnRemoveStun(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
             {
@@ -613,7 +613,7 @@ class spell_kologarn_stone_shout : public SpellScriptLoader
 
         class spell_kologarn_stone_shout_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_kologarn_stone_shout_SpellScript);
+            PrepareSpellScript(spell_kologarn_stone_shout_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -639,7 +639,7 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader
 
         class spell_kologarn_summon_focused_eyebeam_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_kologarn_summon_focused_eyebeam_SpellScript);
+            PrepareSpellScript(spell_kologarn_summon_focused_eyebeam_SpellScript)
 
             void HandleForceCast(SpellEffIndex effIndex)
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index e0d46ad21ba..baeae55535c 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -1014,7 +1014,7 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader
 
         class spell_razorscale_devouring_flame_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_razorscale_devouring_flame_SpellScript);
+            PrepareSpellScript(spell_razorscale_devouring_flame_SpellScript)
 
             void HandleSummon(SpellEffIndex effIndex)
             {
@@ -1047,7 +1047,7 @@ class spell_razorscale_flame_breath : public SpellScriptLoader
 
         class spell_razorscale_flame_breath_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_razorscale_flame_breath_SpellScript);
+            PrepareSpellScript(spell_razorscale_flame_breath_SpellScript)
 
             void CheckDamage()
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index c57c3b33d01..7290ab9943c 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -767,7 +767,7 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader
 
         class spell_xt002_searing_light_spawn_life_spark_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark_AuraScript);
+            PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -803,7 +803,7 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader
 
         class spell_xt002_gravity_bomb_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_xt002_gravity_bomb_aura_AuraScript);
+            PrepareAuraScript(spell_xt002_gravity_bomb_aura_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -855,7 +855,7 @@ class spell_xt002_gravity_bomb_damage : public SpellScriptLoader
 
         class spell_xt002_gravity_bomb_damage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_xt002_gravity_bomb_damage_SpellScript);
+            PrepareSpellScript(spell_xt002_gravity_bomb_damage_SpellScript)
 
             void HandleScript(SpellEffIndex /*eff*/)
             {
@@ -887,7 +887,7 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader
 
         class spell_xt002_heart_overload_periodic_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_xt002_heart_overload_periodic_SpellScript);
+            PrepareSpellScript(spell_xt002_heart_overload_periodic_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -954,7 +954,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader
 
         class spell_xt002_tympanic_tantrum_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_xt002_tympanic_tantrum_SpellScript);
+            PrepareSpellScript(spell_xt002_tympanic_tantrum_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -987,7 +987,7 @@ class spell_xt002_submerged : public SpellScriptLoader
 
         class spell_xt002_submerged_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_xt002_submerged_SpellScript);
+            PrepareSpellScript(spell_xt002_submerged_SpellScript)
 
             void HandleScript(SpellEffIndex /*eff*/)
             {
@@ -1018,7 +1018,7 @@ class spell_xt002_stand : public SpellScriptLoader
 
         class spell_xt002_stand_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_xt002_stand_SpellScript);
+            PrepareSpellScript(spell_xt002_stand_SpellScript)
 
             void HandleScript(SpellEffIndex /*eff*/)
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
index 9ce5733ab0b..98a903923ca 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
@@ -1930,7 +1930,7 @@ class spell_yogg_saron_target_selectors : public SpellScriptLoader    // 63744,
 
         class spell_yogg_saron_target_selectors_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_target_selectors_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_target_selectors_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1988,7 +1988,7 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader      // 63795, 65301
 
         class spell_yogg_saron_psychosis_SpellScript : public SanityReduction
         {
-            PrepareSpellScript(spell_yogg_saron_psychosis_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_psychosis_SpellScript)
 
             bool Load() override
             {
@@ -2026,7 +2026,7 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader    // 63830
             public:
                 spell_yogg_saron_malady_of_the_mind_SpellScript() : SanityReduction(3) { }
 
-            PrepareSpellScript(spell_yogg_saron_malady_of_the_mind_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_malady_of_the_mind_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -2049,7 +2049,7 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader    // 63830
 
         class spell_yogg_saron_malady_of_the_mind_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_malady_of_the_mind_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_malady_of_the_mind_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2097,7 +2097,7 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader    // 63802
 
         class spell_yogg_saron_brain_link_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_brain_link_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_brain_link_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -2121,7 +2121,7 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader    // 63802
 
         class spell_yogg_saron_brain_link_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_brain_link_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_brain_link_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2198,7 +2198,7 @@ class spell_yogg_saron_brain_link_damage : public SpellScriptLoader      // 6380
             public:
                 spell_yogg_saron_brain_link_damage_SpellScript() : SanityReduction(2) { }
 
-            PrepareSpellScript(spell_yogg_saron_brain_link_damage_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_brain_link_damage_SpellScript)
 
             void Register() override
             {
@@ -2219,7 +2219,7 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader    // 63030
 
         class spell_yogg_saron_boil_ominously_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_boil_ominously_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_boil_ominously_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2259,7 +2259,7 @@ class spell_yogg_saron_shadow_beacon : public SpellScriptLoader     // 64465
 
         class spell_yogg_saron_shadow_beacon_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_shadow_beacon_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_shadow_beacon_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -2293,7 +2293,7 @@ class spell_yogg_saron_empowering_shadows_range_check : public SpellScriptLoader
 
         class spell_yogg_saron_empowering_shadows_range_check_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_empowering_shadows_range_check_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_empowering_shadows_range_check_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2320,7 +2320,7 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader
 
         class spell_yogg_saron_empowering_shadows_missile_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_empowering_shadows_missile_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_empowering_shadows_missile_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2355,7 +2355,7 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader     // 64
 
         class spell_yogg_saron_constrictor_tentacle_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_constrictor_tentacle_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_constrictor_tentacle_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2388,7 +2388,7 @@ class spell_yogg_saron_lunge : public SpellScriptLoader    // 64131
 
         class spell_yogg_saron_lunge_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_lunge_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_lunge_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2425,7 +2425,7 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader     // 64125
 
         class spell_yogg_saron_squeeze_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_squeeze_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_squeeze_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -2453,7 +2453,7 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader     // 64148
 
         class spell_yogg_saron_diminsh_power_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_diminsh_power_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_diminsh_power_AuraScript)
 
             void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
             {
@@ -2483,7 +2483,7 @@ class spell_yogg_saron_empowered : public SpellScriptLoader     // 64161
 
         class spell_yogg_saron_empowered_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_empowered_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_empowered_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2534,7 +2534,7 @@ class spell_yogg_saron_match_health : public SpellScriptLoader    // 64069
 
         class spell_yogg_saron_match_health_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_match_health_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_match_health_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2561,7 +2561,7 @@ class spell_yogg_saron_shattered_illusion : public SpellScriptLoader    // 65238
 
         class spell_yogg_saron_shattered_illusion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_shattered_illusion_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_shattered_illusion_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2588,7 +2588,7 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader     /
 
         class spell_yogg_saron_death_ray_warning_visual_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_death_ray_warning_visual_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_death_ray_warning_visual_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2629,7 +2629,7 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader    /
 
         class spell_yogg_saron_cancel_illusion_room_aura_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_cancel_illusion_room_aura_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_cancel_illusion_room_aura_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2666,7 +2666,7 @@ class spell_yogg_saron_nondescript : public SpellScriptLoader     // 64010, 6401
 
         class spell_yogg_saron_nondescript_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_nondescript_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_nondescript_AuraScript)
 
             void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
             {
@@ -2692,7 +2692,7 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader    // 64012
 
         class spell_yogg_saron_revealed_tentacle_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_revealed_tentacle_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_revealed_tentacle_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2732,7 +2732,7 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader     // 63305
 
         class spell_yogg_saron_grim_reprisal_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_grim_reprisal_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_grim_reprisal_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2766,7 +2766,7 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader    // 64059
 
         class spell_yogg_saron_induce_madness_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_induce_madness_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_induce_madness_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2816,7 +2816,7 @@ class spell_yogg_saron_sanity : public SpellScriptLoader     // 63050
 
         class spell_yogg_saron_sanity_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_sanity_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_sanity_SpellScript)
 
             // don't target players outside of room or handle it in SPELL_INSANE_PERIODIC?
 
@@ -2833,7 +2833,7 @@ class spell_yogg_saron_sanity : public SpellScriptLoader     // 63050
 
         class spell_yogg_saron_sanity_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_sanity_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_sanity_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2892,7 +2892,7 @@ class spell_yogg_saron_insane : public SpellScriptLoader     // 63120
 
         class spell_yogg_saron_insane_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_insane_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_insane_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2936,7 +2936,7 @@ class spell_yogg_saron_insane_periodic : public SpellScriptLoader    // 64555
 
         class spell_yogg_saron_insane_periodic_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_insane_periodic_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_insane_periodic_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2977,7 +2977,7 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader      // 64164, 64
 
         class spell_yogg_saron_lunatic_gaze_SpellScript : public SanityReduction
         {
-            PrepareSpellScript(spell_yogg_saron_lunatic_gaze_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_lunatic_gaze_SpellScript)
 
             bool Load() override
             {
@@ -3011,7 +3011,7 @@ class spell_yogg_saron_keeper_aura : public SpellScriptLoader     // 62650, 6267
 
         class spell_yogg_saron_keeper_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_keeper_aura_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_keeper_aura_AuraScript)
 
             bool CanApply(Unit* target)
             {
@@ -3039,7 +3039,7 @@ class spell_yogg_saron_hate_to_zero : public SpellScriptLoader    // 63984
 
         class spell_yogg_saron_hate_to_zero_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_hate_to_zero_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_hate_to_zero_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -3067,7 +3067,7 @@ class spell_yogg_saron_in_the_maws_of_the_old_god : public SpellScriptLoader
 
         class spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript)
 
             SpellCastResult CheckRequirement()
             {
@@ -3103,7 +3103,7 @@ class spell_yogg_saron_titanic_storm : public SpellScriptLoader    // 64172
 
         class spell_yogg_saron_titanic_storm_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_titanic_storm_SpellScript);
+            PrepareSpellScript(spell_yogg_saron_titanic_storm_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -3130,7 +3130,7 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader     //
 
         class spell_yogg_saron_hodirs_protective_gaze_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_hodirs_protective_gaze_AuraScript);
+            PrepareAuraScript(spell_yogg_saron_hodirs_protective_gaze_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 67bf6214374..3e1d75e0f21 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -395,7 +395,7 @@ class spell_ingvar_summon_banshee : public SpellScriptLoader
 
         class spell_ingvar_summon_banshee_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ingvar_summon_banshee_SpellScript);
+            PrepareSpellScript(spell_ingvar_summon_banshee_SpellScript)
 
             void SetDest(SpellDestination& dest)
             {
@@ -422,7 +422,7 @@ class spell_ingvar_woe_strike : public SpellScriptLoader
 
         class spell_ingvar_woe_strike_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ingvar_woe_strike_AuraScript);
+            PrepareAuraScript(spell_ingvar_woe_strike_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index 890c39fa775..fefa27fc754 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -325,7 +325,7 @@ class spell_frost_tomb : public SpellScriptLoader
 
         class spell_frost_tomb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_frost_tomb_AuraScript);
+            PrepareAuraScript(spell_frost_tomb_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index e54c8847d46..5e19041eb62 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -126,7 +126,7 @@ class spell_ticking_time_bomb : public SpellScriptLoader
 
         class spell_ticking_time_bomb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ticking_time_bomb_AuraScript);
+            PrepareAuraScript(spell_ticking_time_bomb_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -165,7 +165,7 @@ class spell_fixate : public SpellScriptLoader
 
         class spell_fixate_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_fixate_SpellScript);
+            PrepareSpellScript(spell_fixate_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 621ef20e7e4..84e71900446 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -488,7 +488,7 @@ class spell_paralyze_pinnacle : public SpellScriptLoader
 
         class spell_paralyze_pinnacle_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_paralyze_pinnacle_SpellScript);
+            PrepareSpellScript(spell_paralyze_pinnacle_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
index c164f8fbf60..7437bddf1f6 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
@@ -217,7 +217,7 @@ class spell_archavon_rock_shards : public SpellScriptLoader
 
         class spell_archavon_rock_shards_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_archavon_rock_shards_SpellScript);
+            PrepareSpellScript(spell_archavon_rock_shards_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
index b6c836eb0cd..37604d116cd 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
@@ -189,7 +189,7 @@ class spell_koralon_meteor_fists : public SpellScriptLoader
 
         class spell_koralon_meteor_fists_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_koralon_meteor_fists_AuraScript);
+            PrepareAuraScript(spell_koralon_meteor_fists_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -223,7 +223,7 @@ class spell_koralon_meteor_fists_damage : public SpellScriptLoader
 
         class spell_koralon_meteor_fists_damage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_koralon_meteor_fists_damage_SpellScript);
+            PrepareSpellScript(spell_koralon_meteor_fists_damage_SpellScript)
 
             bool Load() override
             {
@@ -265,7 +265,7 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader
 
         class spell_flame_warder_meteor_fists_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_flame_warder_meteor_fists_AuraScript);
+            PrepareAuraScript(spell_flame_warder_meteor_fists_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index c226edf28b8..d994f96dc4a 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -2548,7 +2548,7 @@ public:
 
     class spell_windsoul_totem_aura_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_windsoul_totem_aura_AuraScript);
+        PrepareAuraScript(spell_windsoul_totem_aura_AuraScript)
 
         void OnRemove(AuraEffect const*, AuraEffectHandleModes)
         {
diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
index bda6d953d9f..4ba87ac539e 100644
--- a/src/server/scripts/Northrend/zone_dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
@@ -432,7 +432,7 @@ public:
 
     class spell_q12096_q12092_dummy_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_q12096_q12092_dummy_SpellScript);
+        PrepareSpellScript(spell_q12096_q12092_dummy_SpellScript)
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
@@ -479,7 +479,7 @@ public:
 
     class spell_q12096_q12092_bark_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_q12096_q12092_bark_SpellScript);
+        PrepareSpellScript(spell_q12096_q12092_bark_SpellScript)
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index e98d424abd5..d2e6df7b3c7 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -761,7 +761,7 @@ class spell_shredder_delivery : public SpellScriptLoader
 
         class spell_shredder_delivery_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_shredder_delivery_SpellScript);
+            PrepareSpellScript(spell_shredder_delivery_SpellScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index c577fb2864f..1adf5aa0fa9 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -443,7 +443,7 @@ class spell_mindless_abomination_explosion_fx_master : public SpellScriptLoader
 
         class spell_mindless_abomination_explosion_fx_master_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mindless_abomination_explosion_fx_master_SpellScript);
+            PrepareSpellScript(spell_mindless_abomination_explosion_fx_master_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index 3ec138dcfaa..54c07b17366 100644
--- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
@@ -762,7 +762,7 @@ public:
 
     class spell_q12620_the_lifewarden_wrath_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_q12620_the_lifewarden_wrath_SpellScript);
+        PrepareSpellScript(spell_q12620_the_lifewarden_wrath_SpellScript)
 
         void HandleSendEvent(SpellEffIndex effIndex)
         {
@@ -850,7 +850,7 @@ public:
 
     class spell_q12589_shoot_rjr_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_q12589_shoot_rjr_SpellScript);
+        PrepareSpellScript(spell_q12589_shoot_rjr_SpellScript)
 
         SpellCastResult CheckCast()
         {
@@ -1109,7 +1109,7 @@ public:
 
     class spell_shango_tracks_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_shango_tracks_SpellScript);
+        PrepareSpellScript(spell_shango_tracks_SpellScript)
 
         void HandleScript(SpellEffIndex /*effIndex*/)
         {
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index a7faf776721..ee0c4522c8a 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -732,7 +732,7 @@ class spell_jokkum_scriptcast : public SpellScriptLoader
 
         class spell_jokkum_scriptcast_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_jokkum_scriptcast_AuraScript);
+            PrepareAuraScript(spell_jokkum_scriptcast_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -765,7 +765,7 @@ class spell_veranus_summon : public SpellScriptLoader
 
         class spell_veranus_summon_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_veranus_summon_AuraScript);
+            PrepareAuraScript(spell_veranus_summon_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -804,7 +804,7 @@ class spell_close_rift : public SpellScriptLoader
 
         class spell_close_rift_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_close_rift_AuraScript);
+            PrepareAuraScript(spell_close_rift_AuraScript)
 
             bool Load() override
             {
diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp
index fe74997bb39..a2f0ff45787 100644
--- a/src/server/scripts/Northrend/zone_wintergrasp.cpp
+++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp
@@ -481,7 +481,7 @@ class spell_wintergrasp_force_building : public SpellScriptLoader
 
         class spell_wintergrasp_force_building_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_wintergrasp_force_building_SpellScript);
+            PrepareSpellScript(spell_wintergrasp_force_building_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -518,7 +518,7 @@ class spell_wintergrasp_grab_passenger : public SpellScriptLoader
 
         class spell_wintergrasp_grab_passenger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_wintergrasp_grab_passenger_SpellScript);
+            PrepareSpellScript(spell_wintergrasp_grab_passenger_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -574,7 +574,7 @@ public:
 
     class spell_wintergrasp_defender_teleport_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_wintergrasp_defender_teleport_SpellScript);
+        PrepareSpellScript(spell_wintergrasp_defender_teleport_SpellScript)
 
         SpellCastResult CheckCast()
         {
@@ -605,7 +605,7 @@ public:
 
     class spell_wintergrasp_defender_teleport_trigger_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_wintergrasp_defender_teleport_trigger_SpellScript);
+        PrepareSpellScript(spell_wintergrasp_defender_teleport_trigger_SpellScript)
 
         void HandleDummy(SpellEffIndex /*effindex*/)
         {
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 78b9a99b2e4..632eaa7396b 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -613,7 +613,7 @@ class spell_random_ingredient_aura : public SpellScriptLoader
 
         class spell_random_ingredient_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_random_ingredient_aura_AuraScript);
+            PrepareAuraScript(spell_random_ingredient_aura_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -660,7 +660,7 @@ class spell_random_ingredient : public SpellScriptLoader
 
         class spell_random_ingredient_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_random_ingredient_SpellScript);
+            PrepareSpellScript(spell_random_ingredient_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -724,7 +724,7 @@ class spell_pot_check : public SpellScriptLoader
 
         class spell_pot_check_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pot_check_SpellScript);
+            PrepareSpellScript(spell_pot_check_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -817,7 +817,7 @@ class spell_fetch_ingredient_aura : public SpellScriptLoader
 
         class spell_fetch_ingredient_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_fetch_ingredient_aura_AuraScript);
+            PrepareAuraScript(spell_fetch_ingredient_aura_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {