Scripts/Spells: Replace RegisterAuraScript with RegisterSpellScript and remove it

(cherry picked from commit 7d4fbf706ae19481468901ccd65c497fcabe56bf)

56 files changed, 304 insertions, 305 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 0e2c48f4e06..3941d450575 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -1238,7 +1238,6 @@ private:
 
 #define RegisterSpellScriptWithArgs(spell_script, script_name, ...) new GenericSpellAndAuraScriptLoader<spell_script, decltype(std::make_tuple(__VA_ARGS__))>(script_name, std::make_tuple(__VA_ARGS__))
 #define RegisterSpellScript(spell_script) RegisterSpellScriptWithArgs(spell_script, #spell_script)
-#define RegisterAuraScript(aura_script) RegisterSpellScriptWithArgs(aura_script, #aura_script)
 #define RegisterSpellAndAuraScriptPairWithArgs(script_1, script_2, script_name, ...) new GenericSpellAndAuraScriptLoader<script_1, script_2, decltype(std::make_tuple(__VA_ARGS__))>(script_name, std::make_tuple(__VA_ARGS__))
 #define RegisterSpellAndAuraScriptPair(script_1, script_2) RegisterSpellAndAuraScriptPairWithArgs(script_1, script_2, #script_1)
 
diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp
index 8d4b38852d4..7ba2a494731 100644
--- a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp
+++ b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp
@@ -892,18 +892,18 @@ void AddSC_boss_garothi_worldbreaker()
 {
     RegisterAntorusTheBurningThroneCreatureAI(boss_garothi_worldbreaker);
     RegisterAreaTriggerAI(at_garothi_annihilation);
-    RegisterAuraScript(spell_garothi_apocalypse_drive);
+    RegisterSpellScript(spell_garothi_apocalypse_drive);
     RegisterSpellScript(spell_garothi_fel_bombardment_selector);
-    RegisterAuraScript(spell_garothi_fel_bombardment_warning);
-    RegisterAuraScript(spell_garothi_fel_bombardment_periodic);
+    RegisterSpellScript(spell_garothi_fel_bombardment_warning);
+    RegisterSpellScript(spell_garothi_fel_bombardment_periodic);
     RegisterSpellScript(spell_garothi_searing_barrage_dummy);
     RegisterSpellScript(spell_garothi_searing_barrage_selector);
     RegisterSpellScript(spell_garothi_decimation_selector);
-    RegisterAuraScript(spell_garothi_decimation_warning);
-    RegisterAuraScript(spell_garothi_carnage);
+    RegisterSpellScript(spell_garothi_decimation_warning);
+    RegisterSpellScript(spell_garothi_carnage);
     RegisterSpellScript(spell_garothi_annihilation_selector);
     RegisterSpellScript(spell_garothi_annihilation_triggered);
     RegisterSpellScript(spell_garothi_eradication);
-    RegisterAuraScript(spell_garothi_surging_fel);
+    RegisterSpellScript(spell_garothi_surging_fel);
     RegisterSpellScript(spell_garothi_cannon_chooser);
 }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
index 5ddc48c5778..20f6d96c8a4 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
@@ -593,7 +593,7 @@ void AddSC_boss_coren_direbrew()
     RegisterSpellScript(spell_direbrew_summon_mole_machine_target_picker);
     RegisterSpellScript(spell_send_mug_target_picker);
     RegisterSpellScript(spell_request_second_mug);
-    RegisterAuraScript(spell_send_mug_control_aura);
-    RegisterAuraScript(spell_barreled_control_aura);
-    RegisterAuraScript(spell_direbrew_disarm);
+    RegisterSpellScript(spell_send_mug_control_aura);
+    RegisterSpellScript(spell_barreled_control_aura);
+    RegisterSpellScript(spell_direbrew_disarm);
 }
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 3ca8febae3b..01fb56d5d52 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -510,5 +510,5 @@ void AddSC_boss_felblood_kaelthas()
 {
     RegisterMagistersTerraceCreatureAI(boss_felblood_kaelthas);
     RegisterMagistersTerraceCreatureAI(npc_felblood_kaelthas_phoenix);
-    RegisterAuraScript(spell_felblood_kaelthas_flame_strike);
+    RegisterSpellScript(spell_felblood_kaelthas_flame_strike);
 }
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 943108e202c..08404f919fa 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -1122,7 +1122,7 @@ void AddSC_the_scarlet_enclave_c1()
     new npc_death_knight_initiate();
     RegisterCreatureAI(npc_dark_rider_of_acherus);
     new npc_salanar_the_horseman();
-    RegisterAuraScript(spell_stable_master_repo);
+    RegisterSpellScript(spell_stable_master_repo);
     RegisterSpellScript(spell_deliver_stolen_horse);
     new npc_ros_dark_rider();
     new npc_dkc1_gothik();
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 1f79dfcf283..d2b3b6e9329 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -398,5 +398,5 @@ void AddSC_stratholme()
     new npc_restless_soul();
     new npc_spectral_ghostly_citizen();
     RegisterSpellScript(spell_ysida_saved_credit);
-    RegisterAuraScript(spell_stratholme_haunting_phantoms);
+    RegisterSpellScript(spell_stratholme_haunting_phantoms);
 }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index dba6691bdc9..8b3a9de81a9 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -802,6 +802,6 @@ void AddSC_boss_kalecgos()
     RegisterSpellScript(spell_kalecgos_tap_check);
     RegisterSpellScript(spell_kalecgos_spectral_blast);
     RegisterSpellScript(spell_kalecgos_spectral_realm_trigger);
-    RegisterAuraScript(spell_kalecgos_spectral_realm_aura);
-    RegisterAuraScript(spell_kalecgos_curse_of_boundless_agony);
+    RegisterSpellScript(spell_kalecgos_spectral_realm_aura);
+    RegisterSpellScript(spell_kalecgos_curse_of_boundless_agony);
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index 7e23293e527..15952e2da41 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -159,5 +159,5 @@ class spell_salramm_steal_flesh : public AuraScript
 void AddSC_boss_salramm()
 {
     new boss_salramm();
-    RegisterAuraScript(spell_salramm_steal_flesh);
+    RegisterSpellScript(spell_salramm_steal_flesh);
 }
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
index 6c36ade96d9..c53ba579991 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
@@ -856,18 +856,18 @@ void AddSC_boss_baleroc()
     RegisterFirelandsAI(boss_baleroc);
     RegisterFirelandsAI(npc_shard_of_torment);
     RegisterSpellScript(spell_baleroc_blades_of_baleroc);
-    RegisterAuraScript(spell_baleroc_inferno_blade);
-    RegisterAuraScript(spell_baleroc_decimation_blade);
+    RegisterSpellScript(spell_baleroc_inferno_blade);
+    RegisterSpellScript(spell_baleroc_decimation_blade);
     RegisterSpellScript(spell_baleroc_decimating_strike);
     RegisterSpellScript(spell_baleroc_countdown_aoe_dummy);
-    RegisterAuraScript(spell_baleroc_countdown);
+    RegisterSpellScript(spell_baleroc_countdown);
     RegisterSpellScript(spell_baleroc_countdown_proximity_check);
     RegisterSpellScript(spell_baleroc_shards_of_torment_target_search);
     RegisterSpellScript(spell_baleroc_torment_target_search);
     RegisterSpellAndAuraScriptPair(spell_baleroc_torment, spell_baleroc_torment_AuraScript);
-    RegisterAuraScript(spell_baleroc_tormented);
+    RegisterSpellScript(spell_baleroc_tormented);
     RegisterSpellScript(spell_baleroc_tormented_spread);
-    RegisterAuraScript(spell_baleroc_vital_spark);
-    RegisterAuraScript(spell_baleroc_vital_flame);
+    RegisterSpellScript(spell_baleroc_vital_spark);
+    RegisterSpellScript(spell_baleroc_vital_flame);
     new achievement_share_the_pain();
 };
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 20b5136e5b5..705ccdd3b72 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -641,5 +641,5 @@ void AddSC_azuremyst_isle()
     new npc_engineer_spark_overgrind();
     new npc_injured_draenei();
     new npc_magwin();
-    RegisterAuraScript(spell_inoculate_nestlewood);
+    RegisterSpellScript(spell_inoculate_nestlewood);
 }
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 6b64dca7038..46521035ff4 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -1439,5 +1439,5 @@ void AddSC_silithus()
     new npc_anachronos_the_ancient();
     new npc_qiraj_war_spawn();
     new go_wind_stone();
-    RegisterAuraScript(spell_silithus_summon_cultist_periodic);
+    RegisterSpellScript(spell_silithus_summon_cultist_periodic);
 }
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
index e52ebcd463e..91452e736f2 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
@@ -280,5 +280,5 @@ void AddSC_boss_amanitar()
 {
     RegisterAhnKahetCreatureAI(boss_amanitar);
     RegisterAhnKahetCreatureAI(npc_amanitar_mushrooms);
-    RegisterAuraScript(spell_amanitar_potent_fungus);
+    RegisterSpellScript(spell_amanitar_potent_fungus);
 }
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
index a80530aec30..fed5c969258 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
@@ -173,5 +173,5 @@ class spell_combined_toxins : public AuraScript
 void AddSC_instance_ahnkahet()
 {
     new instance_ahnkahet();
-    RegisterAuraScript(spell_combined_toxins);
+    RegisterSpellScript(spell_combined_toxins);
 }
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index 6f831619168..ba18ecd5104 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -652,6 +652,6 @@ void AddSC_boss_anub_arak()
     RegisterCreatureAIWithFactory(npc_anubarak_anub_ar_venomancer, GetAzjolNerubAI);
     RegisterCreatureAIWithFactory(npc_anubarak_impale_target, GetAzjolNerubAI);
 
-    RegisterAuraScript(spell_anubarak_pound);
-    RegisterAuraScript(spell_anubarak_carrion_beetles);
+    RegisterSpellScript(spell_anubarak_pound);
+    RegisterSpellScript(spell_anubarak_carrion_beetles);
 }
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 6febcf7f365..d69cbd84a8a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -961,7 +961,7 @@ void AddSC_boss_anubarak_trial()
     new npc_anubarak_spike();
     new npc_frost_sphere();
 
-    RegisterAuraScript(spell_pursuing_spikes);
+    RegisterSpellScript(spell_pursuing_spikes);
     new spell_impale();
     new spell_anubarak_leeching_swarm();
 }
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 0ae2d22f75d..21eb7f34ceb 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -559,7 +559,7 @@ void AddSC_boss_jaraxxus()
     RegisterTrialOfTheCrusaderCreatureAI(npc_fel_infernal);
     RegisterTrialOfTheCrusaderCreatureAI(npc_nether_portal);
     RegisterTrialOfTheCrusaderCreatureAI(npc_mistress_of_pain);
-    RegisterAuraScript(spell_mistress_kiss);
+    RegisterSpellScript(spell_mistress_kiss);
     RegisterSpellScript(spell_mistress_kiss_area);
     RegisterSpellScript(spell_fel_streak_visual);
 }
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 af583068cb0..82660da7619 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -1375,16 +1375,16 @@ void AddSC_boss_northrend_beasts()
     RegisterTrialOfTheCrusaderCreatureAI(boss_icehowl);
     RegisterTrialOfTheCrusaderCreatureAI(npc_fire_bomb);
 
-    RegisterAuraScript(spell_gormok_jump_to_hand);
-    RegisterAuraScript(spell_gormok_ride_player);
-    RegisterAuraScript(spell_gormok_snobolled);
-    RegisterAuraScript(spell_jormungars_paralytic_toxin);
+    RegisterSpellScript(spell_gormok_jump_to_hand);
+    RegisterSpellScript(spell_gormok_ride_player);
+    RegisterSpellScript(spell_gormok_snobolled);
+    RegisterSpellScript(spell_jormungars_paralytic_toxin);
     RegisterSpellScript(spell_jormungars_burning_bile);
-    RegisterAuraScript(spell_jormungars_slime_pool);
+    RegisterSpellScript(spell_jormungars_slime_pool);
     new spell_jormungars_snakes_spray("spell_jormungars_burning_spray", SPELL_BURNING_BILE);
     new spell_jormungars_snakes_spray("spell_jormungars_paralytic_spray", SPELL_PARALYTIC_TOXIN);
-    RegisterAuraScript(spell_jormungars_paralysis);
+    RegisterSpellScript(spell_jormungars_paralysis);
     RegisterSpellScript(spell_icehowl_arctic_breath);
     RegisterSpellScript(spell_icehowl_trample);
-    RegisterAuraScript(spell_icehowl_massive_crash);
+    RegisterSpellScript(spell_icehowl_massive_crash);
 }
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 a4e1bf0051e..e760e55ebc2 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -919,7 +919,7 @@ void AddSC_boss_twin_valkyr()
     new npc_essence_of_twin();
     new npc_bullet_controller();
 
-    RegisterAuraScript(spell_bullet_controller);
+    RegisterSpellScript(spell_bullet_controller);
     new spell_powering_up();
     new spell_valkyr_essences();
     new spell_power_of_the_twins();
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index 868246f7829..dddbb7cb1e1 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -305,5 +305,5 @@ void AddSC_forge_of_souls()
 {
     new npc_sylvanas_fos();
     new npc_jaina_fos();
-    RegisterAuraScript(spell_forge_of_souls_soul_sickness);
+    RegisterSpellScript(spell_forge_of_souls_soul_sickness);
 }
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index 87d6a2e6292..23ecce42299 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -663,9 +663,9 @@ void AddSC_boss_ick()
 {
     RegisterPitOfSaronCreatureAI(boss_ick);
     RegisterPitOfSaronCreatureAI(boss_krick);
-    RegisterAuraScript(spell_krick_explosive_barrage);
-    RegisterAuraScript(spell_ick_explosive_barrage);
-    RegisterAuraScript(spell_exploding_orb_hasty_grow);
+    RegisterSpellScript(spell_krick_explosive_barrage);
+    RegisterSpellScript(spell_ick_explosive_barrage);
+    RegisterSpellScript(spell_exploding_orb_hasty_grow);
     RegisterSpellAndAuraScriptPair(spell_krick_pursuit, spell_krick_pursuit_AuraScript);
-    RegisterAuraScript(spell_krick_pursuit_confusion);
+    RegisterSpellScript(spell_krick_pursuit_confusion);
 }
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index b880fa32ed2..c93bd66e007 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -1580,9 +1580,9 @@ void AddSC_icecrown_citadel()
     RegisterIcecrownCitadelCreatureAI(npc_darkfallen_advisor);
     RegisterIcecrownCitadelCreatureAI(npc_darkfallen_tactician);
     RegisterGameObjectAI(go_empowering_blood_orb);
-    RegisterAuraScript(spell_icc_empowered_blood);
-    RegisterAuraScript(spell_icc_empowered_blood_3);
-    RegisterAuraScript(spell_icc_siphon_essence);
+    RegisterSpellScript(spell_icc_empowered_blood);
+    RegisterSpellScript(spell_icc_empowered_blood_3);
+    RegisterSpellScript(spell_icc_siphon_essence);
     RegisterSpellScript(spell_darkfallen_blood_mirror);
     RegisterSpellScript(spell_generic_remove_empowered_blood);
     new spell_icc_stoneform();
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index 2060f8ec5ab..76ff22d3fc5 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -761,6 +761,6 @@ void AddSC_boss_four_horsemen()
     new boss_four_horsemen_thane();
     new boss_four_horsemen_lady();
     new boss_four_horsemen_sir();
-    RegisterAuraScript(spell_four_horsemen_mark);
+    RegisterSpellScript(spell_four_horsemen_mark);
     RegisterSpellScript(spell_four_horsemen_consumption);
 }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 6756d0b7f53..ee0bfb57efa 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -1032,7 +1032,7 @@ void AddSC_boss_kelthuzad()
     new npc_kelthuzad_guardian();
     new spell_kelthuzad_chains();
     new spell_kelthuzad_detonate_mana();
-    RegisterAuraScript(spell_kelthuzad_frost_blast);
+    RegisterSpellScript(spell_kelthuzad_frost_blast);
     new at_kelthuzad_center();
     new achievement_just_cant_get_enough();
 }
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index d176feeb446..f4f5ead41c8 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -372,5 +372,5 @@ class spell_urom_frostbomb : public AuraScript
 void AddSC_boss_urom()
 {
     new boss_urom();
-    RegisterAuraScript(spell_urom_frostbomb);
+    RegisterSpellScript(spell_urom_frostbomb);
 }
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 36b8f21de73..978099325f0 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
@@ -1275,14 +1275,14 @@ void AddSC_boss_algalon_the_observer()
     RegisterUlduarCreatureAI(npc_collapsing_star);
     RegisterUlduarCreatureAI(npc_brann_bronzebeard_algalon);
     RegisterGameObjectAI(go_celestial_planetarium_access);
-    RegisterAuraScript(spell_algalon_phase_punch);
-    RegisterAuraScript(spell_algalon_phase_constellation);
+    RegisterSpellScript(spell_algalon_phase_punch);
+    RegisterSpellScript(spell_algalon_phase_constellation);
     RegisterSpellScript(spell_algalon_trigger_3_adds);
-    RegisterAuraScript(spell_algalon_collapse);
+    RegisterSpellScript(spell_algalon_collapse);
     RegisterSpellScript(spell_algalon_big_bang);
-    RegisterAuraScript(spell_algalon_remove_phase);
+    RegisterSpellScript(spell_algalon_remove_phase);
     RegisterSpellScript(spell_algalon_cosmic_smash);
     RegisterSpellScript(spell_algalon_cosmic_smash_damage);
     RegisterSpellScript(spell_algalon_supermassive_fail);
-    RegisterAuraScript(spell_algalon_black_hole_phase_shifts);
+    RegisterSpellScript(spell_algalon_black_hole_phase_shifts);
 }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index 977b87dc0a5..06dc0c246b3 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -704,7 +704,7 @@ void AddSC_boss_auriaya()
     RegisterSpellScript(spell_auriaya_strenght_of_the_pack);
     RegisterSpellScript(spell_auriaya_sentinel_blast);
     RegisterSpellScript(spell_auriaya_agro_creator);
-    RegisterAuraScript(spell_auriaya_random_agro_periodic);
+    RegisterSpellScript(spell_auriaya_random_agro_periodic);
     RegisterSpellScript(spell_auriaya_feral_essence_removal);
     RegisterSpellScript(spell_auriaya_feral_rush);
     new achievement_nine_lives();
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 3f5ced199b1..f3fbfdebf7f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -1881,8 +1881,8 @@ void AddSC_boss_flame_leviathan()
     new achievement_nuked_from_orbit();
     new achievement_orbit_uary();
 
-    RegisterAuraScript(spell_overload_circuit);
-    RegisterAuraScript(spell_tar_blaze);
+    RegisterSpellScript(spell_overload_circuit);
+    RegisterSpellScript(spell_tar_blaze);
     new spell_load_into_catapult();
     new spell_auto_repair();
     new spell_systems_shutdown();
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index e307834d869..5f5104b2649 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -1746,7 +1746,7 @@ void AddSC_boss_razorscale()
     new go_razorscale_mole_machine();
     RegisterSpellScript(spell_razorscale_flame_breath);
     RegisterSpellScript(spell_razorscale_summon_iron_dwarves);
-    RegisterAuraScript(spell_razorscale_fuse_armor);
+    RegisterSpellScript(spell_razorscale_fuse_armor);
     RegisterSpellScript(spell_razorscale_firebolt);
     new achievement_iron_dwarf_medium_rare();
     new achievement_quick_shave();
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index 36833c7999d..382f7b74555 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -1015,15 +1015,15 @@ void AddSC_boss_xt002()
     RegisterUlduarCreatureAI(npc_life_spark);
     RegisterUlduarCreatureAI(npc_xt_void_zone);
 
-    RegisterAuraScript(spell_xt002_searing_light_spawn_life_spark);
-    RegisterAuraScript(spell_xt002_gravity_bomb_aura);
+    RegisterSpellScript(spell_xt002_searing_light_spawn_life_spark);
+    RegisterSpellScript(spell_xt002_gravity_bomb_aura);
     RegisterSpellScript(spell_xt002_gravity_bomb_damage);
     RegisterSpellScript(spell_xt002_heart_overload_periodic);
     RegisterSpellScript(spell_xt002_energy_orb);
     RegisterSpellScript(spell_xt002_tympanic_tantrum);
     RegisterSpellScript(spell_xt002_submerged);
-    RegisterAuraScript(spell_xt002_321_boombot_aura);
-    RegisterAuraScript(spell_xt002_exposed_heart);
+    RegisterSpellScript(spell_xt002_321_boombot_aura);
+    RegisterSpellScript(spell_xt002_exposed_heart);
 
     new achievement_nerf_engineering();
     new achievement_heartbreaker();
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index db683abb93b..9f3059fc043 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -988,7 +988,7 @@ void AddSC_boss_skadi()
     new spell_skadi_reset_check();
     new spell_skadi_launch_harpoon();
     new spell_skadi_poisoned_spear();
-    RegisterAuraScript(spell_skadi_ride_vehicle);
+    RegisterSpellScript(spell_skadi_ride_vehicle);
     new spell_summon_gauntlet_mobs_periodic();
     new achievement_girl_love_to_skadi();
     new at_skadi_gaunlet();
diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp
index c50521a6742..6b64ba4eccd 100644
--- a/src/server/scripts/Northrend/zone_wintergrasp.cpp
+++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp
@@ -640,7 +640,7 @@ void AddSC_wintergrasp()
     new achievement_wg_didnt_stand_a_chance();
     new spell_wintergrasp_defender_teleport();
     new spell_wintergrasp_defender_teleport_trigger();
-    RegisterAuraScript(spell_wintergrasp_tenacity_refresh);
+    RegisterSpellScript(spell_wintergrasp_tenacity_refresh);
     new condition_is_wintergrasp_horde();
     new condition_is_wintergrasp_alliance();
 }
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index daf65c1251e..50843c06cb4 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -1060,8 +1060,8 @@ void AddSC_zuldrak()
     new spell_pot_check();
     new spell_fetch_ingredient_aura();
     new npc_storm_cloud();
-    RegisterAuraScript(spell_scourge_disguise);
-    RegisterAuraScript(spell_scourge_disguise_instability);
-    RegisterAuraScript(spell_scourge_disguise_expiring);
+    RegisterSpellScript(spell_scourge_disguise);
+    RegisterSpellScript(spell_scourge_disguise_instability);
+    RegisterSpellScript(spell_scourge_disguise_expiring);
     RegisterSpellScript(spell_drop_disguise);
 }
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 8d993f73f9b..6b93face40a 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -278,5 +278,5 @@ void AddSC_black_temple()
     RegisterBlackTempleCreatureAI(npc_wrathbone_flayer);
     RegisterBlackTempleCreatureAI(npc_angered_soul_fragment);
     RegisterSpellScript(spell_soul_fragment_anger);
-    RegisterAuraScript(spell_illidari_nightlord_shadow_inferno);
+    RegisterSpellScript(spell_illidari_nightlord_shadow_inferno);
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index e376c8b8629..97f7b512ee3 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -2368,24 +2368,24 @@ void AddSC_boss_illidan()
     RegisterBlackTempleCreatureAI(npc_illidari_elite);
     RegisterBlackTempleCreatureAI(npc_illidan_generic_fire);
     RegisterSpellScript(spell_illidan_akama_teleport);
-    RegisterAuraScript(spell_illidan_akama_door_channel);
+    RegisterSpellScript(spell_illidan_akama_door_channel);
     RegisterSpellScript(spell_illidan_draw_soul);
-    RegisterAuraScript(spell_illidan_parasitic_shadowfiend);
-    RegisterAuraScript(spell_illidan_parasitic_shadowfiend_proc);
-    RegisterAuraScript(spell_illidan_remove_parasitic_shadowfiend);
+    RegisterSpellScript(spell_illidan_parasitic_shadowfiend);
+    RegisterSpellScript(spell_illidan_parasitic_shadowfiend_proc);
+    RegisterSpellScript(spell_illidan_remove_parasitic_shadowfiend);
     RegisterSpellScript(spell_illidan_throw_warglaive);
-    RegisterAuraScript(spell_illidan_tear_of_azzinoth_channel);
+    RegisterSpellScript(spell_illidan_tear_of_azzinoth_channel);
     RegisterSpellScript(spell_illidan_flame_blast);
     RegisterSpellScript(spell_illidan_return_glaives);
     RegisterSpellScript(spell_illidan_agonizing_flames);
-    RegisterAuraScript(spell_illidan_demon_transform1);
-    RegisterAuraScript(spell_illidan_demon_transform2);
+    RegisterSpellScript(spell_illidan_demon_transform1);
+    RegisterSpellScript(spell_illidan_demon_transform2);
     RegisterSpellScript(spell_illidan_flame_burst);
     RegisterSpellScript(spell_illidan_find_target);
-    RegisterAuraScript(spell_illidan_eye_blast);
+    RegisterSpellScript(spell_illidan_eye_blast);
     RegisterSpellScript(spell_illidan_cage_trap);
-    RegisterAuraScript(spell_illidan_caged);
-    RegisterAuraScript(spell_maiev_down);
+    RegisterSpellScript(spell_illidan_caged);
+    RegisterSpellScript(spell_maiev_down);
     RegisterSpellScript(spell_illidan_cage_teleport);
     RegisterSpellScript(spell_illidan_despawn_akama);
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
index 6c2ba15a92e..7841490fcfd 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
@@ -812,12 +812,12 @@ void AddSC_boss_illidari_council()
     RegisterBlackTempleCreatureAI(npc_veras_vanish_effect);
     RegisterSpellScript(spell_illidari_council_empyreal_balance);
     RegisterSpellScript(spell_illidari_council_empyreal_equivalency);
-    RegisterAuraScript(spell_illidari_council_balance_of_power);
-    RegisterAuraScript(spell_illidari_council_deadly_strike);
-    RegisterAuraScript(spell_illidari_council_deadly_poison);
-    RegisterAuraScript(spell_illidari_council_vanish);
-    RegisterAuraScript(spell_illidari_council_reflective_shield);
+    RegisterSpellScript(spell_illidari_council_balance_of_power);
+    RegisterSpellScript(spell_illidari_council_deadly_strike);
+    RegisterSpellScript(spell_illidari_council_deadly_poison);
+    RegisterSpellScript(spell_illidari_council_vanish);
+    RegisterSpellScript(spell_illidari_council_reflective_shield);
     RegisterSpellScript(spell_illidari_council_judgement);
-    RegisterAuraScript(spell_illidari_council_seal);
-    RegisterAuraScript(spell_illidari_dampen_magic);
+    RegisterSpellScript(spell_illidari_council_seal);
+    RegisterSpellScript(spell_illidari_dampen_magic);
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 0fd7c967109..fea9aabd29a 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -326,7 +326,7 @@ void AddSC_boss_mother_shahraz()
     RegisterBlackTempleCreatureAI(boss_mother_shahraz);
     RegisterSpellScript(spell_mother_shahraz_fatal_attraction);
     RegisterSpellScript(spell_mother_shahraz_fatal_attraction_link);
-    RegisterAuraScript(spell_mother_shahraz_saber_lash);
-    RegisterAuraScript(spell_mother_shahraz_generic_periodic);
-    RegisterAuraScript(spell_mother_shahraz_random_periodic);
+    RegisterSpellScript(spell_mother_shahraz_saber_lash);
+    RegisterSpellScript(spell_mother_shahraz_generic_periodic);
+    RegisterSpellScript(spell_mother_shahraz_random_periodic);
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 81ee03cc207..3d0dcddf3bf 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -810,8 +810,8 @@ void AddSC_boss_reliquary_of_souls()
     RegisterBlackTempleCreatureAI(boss_essence_of_anger);
     RegisterBlackTempleCreatureAI(npc_enslaved_soul);
     RegisterBlackTempleCreatureAI(npc_reliquary_combat_trigger);
-    RegisterAuraScript(spell_reliquary_of_souls_aura_of_desire);
-    RegisterAuraScript(spell_reliquary_of_souls_submerge);
-    RegisterAuraScript(spell_reliquary_of_souls_spite);
+    RegisterSpellScript(spell_reliquary_of_souls_aura_of_desire);
+    RegisterSpellScript(spell_reliquary_of_souls_submerge);
+    RegisterSpellScript(spell_reliquary_of_souls_spite);
     RegisterSpellScript(spell_reliquary_of_souls_frenzy);
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 5c35dbf8de2..cd9d382ba0c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -1133,6 +1133,6 @@ void AddSC_boss_shade_of_akama()
     RegisterBlackTempleCreatureAI(npc_ashtongue_elementalist);
     RegisterBlackTempleCreatureAI(npc_ashtongue_spiritbinder);
     RegisterBlackTempleCreatureAI(npc_ashtongue_broken);
-    RegisterAuraScript(spell_shade_soul_channel_serverside);
-    RegisterAuraScript(spell_shade_soul_channel);
+    RegisterSpellScript(spell_shade_soul_channel_serverside);
+    RegisterSpellScript(spell_shade_soul_channel);
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index f99353325bd..bc7f5cbd66d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -447,8 +447,8 @@ void AddSC_boss_teron_gorefiend()
     RegisterBlackTempleCreatureAI(boss_teron_gorefiend);
     RegisterBlackTempleCreatureAI(npc_doom_blossom);
     RegisterBlackTempleCreatureAI(npc_shadowy_construct);
-    RegisterAuraScript(spell_teron_gorefiend_shadow_of_death);
-    RegisterAuraScript(spell_teron_gorefiend_spiritual_vengeance);
+    RegisterSpellScript(spell_teron_gorefiend_shadow_of_death);
+    RegisterSpellScript(spell_teron_gorefiend_spiritual_vengeance);
     RegisterSpellScript(spell_teron_gorefiend_shadow_of_death_remove);
     new at_teron_gorefiend_entrance();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index 3830085340e..7dd10361617 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -873,12 +873,12 @@ void AddSC_boss_ahune()
     RegisterSlavePensCreatureAI(npc_ahune_bunny);
     new go_ahune_ice_stone();
     RegisterSpellScript(spell_ahune_synch_health);
-    RegisterAuraScript(spell_summoning_rhyme_aura);
-    RegisterAuraScript(spell_summon_ice_spear_delayer);
-    RegisterAuraScript(spell_ice_spear_control_aura);
+    RegisterSpellScript(spell_summoning_rhyme_aura);
+    RegisterSpellScript(spell_summon_ice_spear_delayer);
+    RegisterSpellScript(spell_ice_spear_control_aura);
     RegisterSpellScript(spell_ice_spear_target_picker);
     RegisterSpellScript(spell_slippery_floor_periodic);
-    RegisterAuraScript(spell_ahune_spanky_hands);
+    RegisterSpellScript(spell_ahune_spanky_hands);
     RegisterSpellScript(spell_ahune_minion_despawner);
     RegisterSpellScript(spell_ice_bombardment_dest_picker);
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index ab636b4efb6..ad370782339 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -622,5 +622,5 @@ void AddSC_boss_alar()
     new boss_alar();
     new npc_ember_of_alar();
     new npc_flame_patch_alar();
-    RegisterAuraScript(spell_alar_flame_quills);
+    RegisterSpellScript(spell_alar_flame_quills);
 }
diff --git a/src/server/scripts/Spells/spell_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp
index 4c85f9cccc7..faacf4ab4bc 100644
--- a/src/server/scripts/Spells/spell_dh.cpp
+++ b/src/server/scripts/Spells/spell_dh.cpp
@@ -446,7 +446,7 @@ class spell_dh_glide_timer : public AuraScript
 
 void AddSC_demon_hunter_spell_scripts()
 {
-    RegisterAuraScript(spell_dh_chaos_strike);
+    RegisterSpellScript(spell_dh_chaos_strike);
 
     new areatrigger_dh_generic_sigil<SPELL_DH_SIGIL_OF_SILENCE_AOE>("areatrigger_dh_sigil_of_silence");
     new areatrigger_dh_generic_sigil<SPELL_DH_SIGIL_OF_MISERY_AOE>("areatrigger_dh_sigil_of_misery");
@@ -461,7 +461,7 @@ void AddSC_demon_hunter_spell_scripts()
 
     /* Auras */
 
-    RegisterAuraScript(spell_dh_first_blood);
+    RegisterSpellScript(spell_dh_first_blood);
 
     /* AreaTrigger */
 
@@ -474,6 +474,6 @@ void AddSC_demon_hunter_spell_scripts()
     // Vengeance & Havoc
 
     RegisterSpellAndAuraScriptPair(spell_dh_glide, spell_dh_glide_AuraScript);
-    RegisterAuraScript(spell_dh_glide_timer);
+    RegisterSpellScript(spell_dh_glide_timer);
 
 }
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index e22b5386e24..bdb8ff18061 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -815,26 +815,26 @@ class spell_dk_vampiric_blood : public AuraScript
 
 void AddSC_deathknight_spell_scripts()
 {
-    RegisterAuraScript(spell_dk_advantage_t10_4p);
-    RegisterAuraScript(spell_dk_anti_magic_shell);
+    RegisterSpellScript(spell_dk_advantage_t10_4p);
+    RegisterSpellScript(spell_dk_anti_magic_shell);
     RegisterSpellScript(spell_dk_army_transform);
     RegisterSpellScript(spell_dk_blood_boil);
-    RegisterAuraScript(spell_dk_dancing_rune_weapon);
+    RegisterSpellScript(spell_dk_dancing_rune_weapon);
     RegisterSpellAndAuraScriptPair(spell_dk_death_and_decay, spell_dk_death_and_decay_AuraScript);
     RegisterSpellScript(spell_dk_death_coil);
     RegisterSpellScript(spell_dk_death_gate);
     RegisterSpellScript(spell_dk_death_grip_initial);
-    RegisterAuraScript(spell_dk_death_pact);
+    RegisterSpellScript(spell_dk_death_pact);
     RegisterSpellScript(spell_dk_death_strike);
-    RegisterAuraScript(spell_dk_death_strike_enabler);
+    RegisterSpellScript(spell_dk_death_strike_enabler);
     RegisterSpellScript(spell_dk_festering_strike);
     RegisterSpellScript(spell_dk_ghoul_explode);
     RegisterSpellScript(spell_dk_glyph_of_scourge_strike_script);
-    RegisterAuraScript(spell_dk_mark_of_blood);
-    RegisterAuraScript(spell_dk_necrosis);
+    RegisterSpellScript(spell_dk_mark_of_blood);
+    RegisterSpellScript(spell_dk_necrosis);
     RegisterSpellScript(spell_dk_pet_geist_transform);
     RegisterSpellScript(spell_dk_pet_skeleton_transform);
-    RegisterAuraScript(spell_dk_pvp_4p_bonus);
+    RegisterSpellScript(spell_dk_pvp_4p_bonus);
     RegisterSpellScript(spell_dk_raise_dead);
-    RegisterAuraScript(spell_dk_vampiric_blood);
+    RegisterSpellScript(spell_dk_vampiric_blood);
 }
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 3251f70b022..ec786ac09bc 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -1742,50 +1742,50 @@ class spell_dru_wild_growth_aura : public AuraScript
 
 void AddSC_druid_spell_scripts()
 {
-    RegisterAuraScript(spell_dru_barkskin);
+    RegisterSpellScript(spell_dru_barkskin);
     RegisterSpellScript(spell_dru_berserk);
-    RegisterAuraScript(spell_dru_brambles);
-    RegisterAuraScript(spell_dru_bristling_fur);
-    RegisterAuraScript(spell_dru_cat_form);
-    RegisterAuraScript(spell_dru_dash);
-    RegisterAuraScript(spell_dru_earthwarden);
-    RegisterAuraScript(spell_dru_eclipse_aura);
-    RegisterAuraScript(spell_dru_eclipse_dummy);
-    RegisterAuraScript(spell_dru_eclipse_ooc);
+    RegisterSpellScript(spell_dru_brambles);
+    RegisterSpellScript(spell_dru_bristling_fur);
+    RegisterSpellScript(spell_dru_cat_form);
+    RegisterSpellScript(spell_dru_dash);
+    RegisterSpellScript(spell_dru_earthwarden);
+    RegisterSpellScript(spell_dru_eclipse_aura);
+    RegisterSpellScript(spell_dru_eclipse_dummy);
+    RegisterSpellScript(spell_dru_eclipse_ooc);
     RegisterSpellScript(spell_dru_ferocious_bite);
     RegisterSpellScript(spell_dru_flight_form);
-    RegisterAuraScript(spell_dru_forms_trinket);
-    RegisterAuraScript(spell_dru_galactic_guardian);
-    RegisterAuraScript(spell_dru_gore);
-    RegisterAuraScript(spell_dru_idol_lifebloom);
+    RegisterSpellScript(spell_dru_forms_trinket);
+    RegisterSpellScript(spell_dru_galactic_guardian);
+    RegisterSpellScript(spell_dru_gore);
+    RegisterSpellScript(spell_dru_idol_lifebloom);
     RegisterSpellScript(spell_dru_incapacitating_roar);
-    RegisterAuraScript(spell_dru_innervate);
-    RegisterAuraScript(spell_dru_item_t6_trinket);
-    RegisterAuraScript(spell_dru_lifebloom);
-    RegisterAuraScript(spell_dru_living_seed);
-    RegisterAuraScript(spell_dru_living_seed_proc);
+    RegisterSpellScript(spell_dru_innervate);
+    RegisterSpellScript(spell_dru_item_t6_trinket);
+    RegisterSpellScript(spell_dru_lifebloom);
+    RegisterSpellScript(spell_dru_living_seed);
+    RegisterSpellScript(spell_dru_living_seed_proc);
     RegisterSpellScript(spell_dru_moonfire);
-    RegisterAuraScript(spell_dru_omen_of_clarity);
-    RegisterAuraScript(spell_dru_predatory_strikes);
+    RegisterSpellScript(spell_dru_omen_of_clarity);
+    RegisterSpellScript(spell_dru_predatory_strikes);
     RegisterSpellScript(spell_dru_prowl);
-    RegisterAuraScript(spell_dru_rip);
+    RegisterSpellScript(spell_dru_rip);
     RegisterSpellAndAuraScriptPair(spell_dru_savage_roar, spell_dru_savage_roar_aura);
     RegisterSpellScript(spell_dru_skull_bash);
-    RegisterAuraScript(spell_dru_stampede);
+    RegisterSpellScript(spell_dru_stampede);
     RegisterSpellScript(spell_dru_stampeding_roar);
     RegisterSpellScript(spell_dru_starfall_dummy);
     RegisterSpellScript(spell_dru_sunfire);
-    RegisterAuraScript(spell_dru_survival_instincts);
-    RegisterAuraScript(spell_dru_swift_flight_passive);
-    RegisterAuraScript(spell_dru_t3_6p_bonus);
-    RegisterAuraScript(spell_dru_t3_8p_bonus);
-    RegisterAuraScript(spell_dru_t4_2p_bonus);
-    RegisterAuraScript(spell_dru_t10_balance_4p_bonus);
+    RegisterSpellScript(spell_dru_survival_instincts);
+    RegisterSpellScript(spell_dru_swift_flight_passive);
+    RegisterSpellScript(spell_dru_t3_6p_bonus);
+    RegisterSpellScript(spell_dru_t3_8p_bonus);
+    RegisterSpellScript(spell_dru_t4_2p_bonus);
+    RegisterSpellScript(spell_dru_t10_balance_4p_bonus);
     RegisterSpellScript(spell_dru_t10_restoration_4p_bonus);
-    RegisterAuraScript(spell_dru_t10_restoration_4p_bonus_dummy);
+    RegisterSpellScript(spell_dru_t10_restoration_4p_bonus_dummy);
     RegisterSpellScript(spell_dru_thrash);
-    RegisterAuraScript(spell_dru_thrash_aura);
-    RegisterAuraScript(spell_dru_travel_form);
+    RegisterSpellScript(spell_dru_thrash_aura);
+    RegisterSpellScript(spell_dru_travel_form);
     RegisterSpellAndAuraScriptPair(spell_dru_travel_form_dummy, spell_dru_travel_form_dummy_aura);
     RegisterSpellAndAuraScriptPair(spell_dru_tiger_dash, spell_dru_tiger_dash_aura);
     RegisterSpellAndAuraScriptPair(spell_dru_wild_growth, spell_dru_wild_growth_aura);
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index a7bc847c3c1..b3979068170 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -4619,60 +4619,60 @@ class spell_gen_anchor_here : public SpellScript
 
 void AddSC_generic_spell_scripts()
 {
-    RegisterAuraScript(spell_gen_absorb0_hitlimit1);
-    RegisterAuraScript(spell_gen_adaptive_warding);
+    RegisterSpellScript(spell_gen_absorb0_hitlimit1);
+    RegisterSpellScript(spell_gen_adaptive_warding);
     RegisterSpellScript(spell_gen_allow_cast_from_item_only);
-    RegisterAuraScript(spell_gen_animal_blood);
+    RegisterSpellScript(spell_gen_animal_blood);
     RegisterSpellScript(spell_spawn_blood_pool);
     RegisterSpellScript(spell_gen_arcane_charge);
-    RegisterAuraScript(spell_gen_arena_drink);
-    RegisterAuraScript(spell_gen_aura_of_anger);
-    RegisterAuraScript(spell_gen_aura_of_fear);
-    RegisterAuraScript(spell_gen_aura_service_uniform);
-    RegisterAuraScript(spell_gen_av_drekthar_presence);
+    RegisterSpellScript(spell_gen_arena_drink);
+    RegisterSpellScript(spell_gen_aura_of_anger);
+    RegisterSpellScript(spell_gen_aura_of_fear);
+    RegisterSpellScript(spell_gen_aura_service_uniform);
+    RegisterSpellScript(spell_gen_av_drekthar_presence);
     RegisterSpellScript(spell_gen_bandage);
-    RegisterAuraScript(spell_gen_blood_reserve);
+    RegisterSpellScript(spell_gen_blood_reserve);
     RegisterSpellScript(spell_gen_bonked);
     RegisterSpellScriptWithArgs(spell_gen_break_shield, "spell_gen_break_shield");
     RegisterSpellScriptWithArgs(spell_gen_break_shield, "spell_gen_tournament_counterattack");
-    RegisterAuraScript(spell_gen_burn_brutallus);
-    RegisterAuraScript(spell_gen_burning_depths_necrolyte_image);
+    RegisterSpellScript(spell_gen_burn_brutallus);
+    RegisterSpellScript(spell_gen_burning_depths_necrolyte_image);
     RegisterSpellScript(spell_gen_cannibalize);
-    RegisterAuraScript(spell_gen_chains_of_ice);
+    RegisterSpellScript(spell_gen_chains_of_ice);
     RegisterSpellScript(spell_gen_chaos_blast);
     RegisterSpellScript(spell_gen_clone);
     RegisterSpellScript(spell_gen_clone_weapon);
-    RegisterAuraScript(spell_gen_clone_weapon_aura);
+    RegisterSpellScript(spell_gen_clone_weapon_aura);
     RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_default_count_pct_from_max_hp");
     RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_50pct_count_pct_from_max_hp", 50);
     RegisterSpellScript(spell_gen_create_lance);
-    RegisterAuraScript(spell_gen_creature_permanent_feign_death);
+    RegisterSpellScript(spell_gen_creature_permanent_feign_death);
     RegisterSpellScriptWithArgs(spell_gen_dalaran_disguise, "spell_gen_sunreaver_disguise");
     RegisterSpellScriptWithArgs(spell_gen_dalaran_disguise, "spell_gen_silver_covenant_disguise");
     RegisterSpellAndAuraScriptPair(spell_gen_decay_over_time_fungal_decay, spell_gen_decay_over_time_spell);
     RegisterSpellAndAuraScriptPair(spell_gen_decay_over_time_tail_sting, spell_gen_decay_over_time_spell);
-    RegisterAuraScript(spell_gen_defend);
+    RegisterSpellScript(spell_gen_defend);
     RegisterSpellScript(spell_gen_despawn_self);
     RegisterSpellScript(spell_gen_divine_storm_cd_reset);
     RegisterSpellScript(spell_gen_ds_flush_knockback);
     RegisterSpellScript(spell_gen_dungeon_credit);
     RegisterSpellScript(spell_gen_elune_candle);
-    RegisterAuraScript(spell_ethereal_pet_aura);
+    RegisterSpellScript(spell_ethereal_pet_aura);
     RegisterSpellScript(spell_ethereal_pet_onsummon);
     RegisterSpellScript(spell_ethereal_pet_aura_remove);
-    RegisterAuraScript(spell_steal_essence_visual);
+    RegisterSpellScript(spell_steal_essence_visual);
     RegisterSpellScript(spell_gen_5000_gold);
     RegisterSpellScript(spell_gen_fishing);
     RegisterSpellScript(spell_gen_gadgetzan_transporter_backfire);
-    RegisterAuraScript(spell_gen_gift_of_naaru);
+    RegisterSpellScript(spell_gen_gift_of_naaru);
     RegisterSpellScript(spell_gen_gnomish_transporter);
     RegisterSpellScriptWithArgs(spell_gen_increase_stats_buff, "spell_pal_blessing_of_kings");
     RegisterSpellScriptWithArgs(spell_gen_increase_stats_buff, "spell_pal_blessing_of_might");
     RegisterSpellScriptWithArgs(spell_gen_increase_stats_buff, "spell_dru_mark_of_the_wild");
     RegisterSpellScriptWithArgs(spell_gen_increase_stats_buff, "spell_pri_power_word_fortitude");
     RegisterSpellScriptWithArgs(spell_gen_increase_stats_buff, "spell_pri_shadow_protection");
-    RegisterAuraScript(spell_gen_interrupt);
-    RegisterAuraScript(spell_gen_lich_pet_aura);
+    RegisterSpellScript(spell_gen_interrupt);
+    RegisterSpellScript(spell_gen_lich_pet_aura);
     RegisterSpellScript(spell_gen_lich_pet_onsummon);
     RegisterSpellScript(spell_gen_lich_pet_aura_remove);
     RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_hexlord_lifebloom", SPELL_HEXLORD_MALACRASS_LIFEBLOOM_FINAL_HEAL);
@@ -4681,38 +4681,38 @@ void AddSC_generic_spell_scripts()
     RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_twisted_visage_lifebloom", SPELL_TWISTED_VISAGE_LIFEBLOOM_FINAL_HEAL);
     RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_faction_champion_dru_lifebloom", SPELL_FACTION_CHAMPIONS_DRU_LIFEBLOOM_FINAL_HEAL);
     RegisterSpellScript(spell_gen_mounted_charge);
-    RegisterAuraScript(spell_gen_moss_covered_feet);
-    RegisterAuraScript(spell_gen_negative_energy_periodic);
+    RegisterSpellScript(spell_gen_moss_covered_feet);
+    RegisterSpellScript(spell_gen_negative_energy_periodic);
     RegisterSpellScript(spell_gen_netherbloom);
     RegisterSpellScript(spell_gen_nightmare_vine);
-    RegisterAuraScript(spell_gen_nitrous_boost);
-    RegisterAuraScript(spell_gen_obsidian_armor);
+    RegisterSpellScript(spell_gen_nitrous_boost);
+    RegisterSpellScript(spell_gen_obsidian_armor);
     RegisterSpellScript(spell_gen_oracle_wolvar_reputation);
     RegisterSpellScript(spell_gen_orc_disguise);
-    RegisterAuraScript(spell_gen_paralytic_poison);
+    RegisterSpellScript(spell_gen_paralytic_poison);
     RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_soul_harvesters_charm");
     RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_commendation_of_kaelthas");
     RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_corpse_tongue_coin");
     RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_corpse_tongue_coin_heroic");
     RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_petrified_twilight_scale");
     RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_petrified_twilight_scale_heroic");
-    RegisterAuraScript(spell_gen_proc_charge_drop_only);
-    RegisterAuraScript(spell_gen_parachute);
+    RegisterSpellScript(spell_gen_proc_charge_drop_only);
+    RegisterSpellScript(spell_gen_parachute);
     RegisterSpellScript(spell_gen_pet_summoned);
     RegisterSpellScript(spell_gen_profession_research);
     RegisterSpellScript(spell_gen_pvp_trinket);
     RegisterSpellScript(spell_gen_remove_flight_auras);
     RegisterSpellScript(spell_gen_remove_impairing_auras);
-    RegisterAuraScript(spell_gen_restoration);
+    RegisterSpellScript(spell_gen_restoration);
     RegisterSpellAndAuraScriptPair(spell_gen_replenishment, spell_gen_replenishment_aura);
     // Running Wild
     RegisterSpellAndAuraScriptPair(spell_gen_running_wild, spell_gen_running_wild_aura);
     RegisterSpellScript(spell_gen_two_forms);
     RegisterSpellScript(spell_gen_darkflight);
     /*                          */
-    RegisterAuraScript(spell_gen_remove_on_health_pct);
-    RegisterAuraScript(spell_gen_remove_on_full_health);
-    RegisterAuraScript(spell_gen_remove_on_full_health_pct);
+    RegisterSpellScript(spell_gen_remove_on_health_pct);
+    RegisterSpellScript(spell_gen_remove_on_full_health);
+    RegisterSpellScript(spell_gen_remove_on_full_health_pct);
     RegisterSpellScript(spell_gen_seaforium_blast);
     RegisterSpellScript(spell_gen_spectator_cheer_trigger);
     RegisterSpellScript(spell_gen_spirit_healer_res);
@@ -4721,30 +4721,30 @@ void AddSC_generic_spell_scripts()
     RegisterSpellScript(spell_gen_summon_tournament_mount);
     RegisterSpellScript(spell_gen_throw_shield);
     RegisterSpellScript(spell_gen_tournament_duel);
-    RegisterAuraScript(spell_gen_tournament_pennant);
+    RegisterSpellScript(spell_gen_tournament_pennant);
     RegisterSpellScript(spell_gen_teleporting);
     RegisterSpellScript(spell_gen_trigger_exclude_caster_aura_spell);
     RegisterSpellScript(spell_gen_trigger_exclude_target_aura_spell);
     RegisterSpellScriptWithArgs(spell_pvp_trinket_wotf_shared_cd<SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER>, "spell_pvp_trinket_shared_cd");
     RegisterSpellScriptWithArgs(spell_pvp_trinket_wotf_shared_cd<SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER_WOTF>, "spell_wotf_shared_cd");
-    RegisterAuraScript(spell_gen_turkey_marker);
+    RegisterSpellScript(spell_gen_turkey_marker);
     RegisterSpellScript(spell_gen_upper_deck_create_foam_sword);
-    RegisterAuraScript(spell_gen_vampiric_touch);
-    RegisterAuraScript(spell_gen_vehicle_scaling);
+    RegisterSpellScript(spell_gen_vampiric_touch);
+    RegisterSpellScript(spell_gen_vehicle_scaling);
     RegisterSpellScript(spell_gen_vendor_bark_trigger);
     RegisterSpellScript(spell_gen_wg_water);
-    RegisterAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper);
+    RegisterSpellScript(spell_gen_whisper_gulch_yogg_saron_whisper);
     RegisterSpellScript(spell_gen_eject_all_passengers);
     RegisterSpellScript(spell_gen_eject_passenger);
-    RegisterAuraScript(spell_gen_gm_freeze);
+    RegisterSpellScript(spell_gen_gm_freeze);
     RegisterSpellScript(spell_gen_stand);
-    RegisterAuraScript(spell_gen_mixology_bonus);
+    RegisterSpellScript(spell_gen_mixology_bonus);
     RegisterSpellScript(spell_gen_landmine_knockback_achievement);
     RegisterSpellScript(spell_gen_clear_debuffs);
-    RegisterAuraScript(spell_gen_pony_mount_check);
-    RegisterAuraScript(spell_corrupting_plague_aura);
-    RegisterAuraScript(spell_stasis_field_aura);
-    RegisterAuraScript(spell_gen_vehicle_control_link);
+    RegisterSpellScript(spell_gen_pony_mount_check);
+    RegisterSpellScript(spell_corrupting_plague_aura);
+    RegisterSpellScript(spell_stasis_field_aura);
+    RegisterSpellScript(spell_gen_vehicle_control_link);
     RegisterSpellScript(spell_freezing_circle);
     RegisterSpellScript(spell_gen_charmed_unit_spell_cooldown);
     RegisterSpellScript(spell_gen_cannon_blast);
@@ -4752,9 +4752,9 @@ void AddSC_generic_spell_scripts()
     RegisterSpellScript(spell_gen_anetheron_summon_towering_infernal);
     RegisterSpellAndAuraScriptPair(spell_gen_mark_of_kazrogal_hellfire, spell_gen_mark_of_kazrogal_hellfire_aura);
     RegisterSpellScript(spell_gen_azgalor_rain_of_fire_hellfire_citadel);
-    RegisterAuraScript(spell_gen_face_rage);
-    RegisterAuraScript(spell_gen_impatient_mind);
-    RegisterAuraScript(spell_gen_war_mode_enlisted);
+    RegisterSpellScript(spell_gen_face_rage);
+    RegisterSpellScript(spell_gen_impatient_mind);
+    RegisterSpellScript(spell_gen_war_mode_enlisted);
     RegisterSpellScript(spell_defender_of_azeroth_death_gate_selector);
     RegisterSpellScript(spell_defender_of_azeroth_speak_with_mograine);
     RegisterSpellScript(spell_summon_battle_pet);
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index 1de756bc54b..c820ba96dd3 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -1973,11 +1973,11 @@ void AddSC_holiday_spell_scripts()
     new spell_brewfest_dismount_ram();
     new spell_brewfest_barker_bunny();
     // Midsummer Fire Festival
-    RegisterAuraScript(spell_midsummer_braziers_hit);
+    RegisterSpellScript(spell_midsummer_braziers_hit);
     RegisterSpellScript(spell_midsummer_torch_target_picker);
     RegisterSpellScript(spell_midsummer_torch_toss_land);
-    RegisterAuraScript(spell_midsummer_test_ribbon_pole_channel);
-    RegisterAuraScript(spell_midsummer_ribbon_pole_periodic_visual);
+    RegisterSpellScript(spell_midsummer_test_ribbon_pole_channel);
+    RegisterSpellScript(spell_midsummer_ribbon_pole_periodic_visual);
     RegisterSpellScript(spell_midsummer_juggle_torch);
     RegisterSpellScript(spell_midsummer_torch_catch);
     RegisterSpellScript(spell_midsummer_fling_torch);
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 29cd6f890b8..9372d91197b 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -733,7 +733,7 @@ public:
 
 void AddSC_hunter_spell_scripts()
 {
-    RegisterAuraScript(spell_hun_a_murder_of_crows);
+    RegisterSpellScript(spell_hun_a_murder_of_crows);
     new spell_hun_aspect_cheetah();
     new spell_hun_exhilaration();
     new spell_hun_hunting_party();
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index 01f61d95b05..6ef83321ce6 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -4538,19 +4538,19 @@ void AddSC_item_spell_scripts()
     // 23075 Mithril Mechanical Dragonling
     new spell_item_trigger_spell("spell_item_mithril_mechanical_dragonling", SPELL_MITHRIL_MECHANICAL_DRAGONLING);
 
-    RegisterAuraScript(spell_item_aegis_of_preservation);
-    RegisterAuraScript(spell_item_absorb_eye_of_grillok);
+    RegisterSpellScript(spell_item_aegis_of_preservation);
+    RegisterSpellScript(spell_item_absorb_eye_of_grillok);
     RegisterSpellScript(spell_item_blessing_of_faith);
-    RegisterAuraScript(spell_item_alchemist_stone);
+    RegisterSpellScript(spell_item_alchemist_stone);
     new spell_item_anger_capacitor<8>("spell_item_tiny_abomination_in_a_jar");
     new spell_item_anger_capacitor<7>("spell_item_tiny_abomination_in_a_jar_hero");
-    RegisterAuraScript(spell_item_arcane_shroud);
-    RegisterAuraScript(spell_item_aura_of_madness);
-    RegisterAuraScript(spell_item_dementia);
+    RegisterSpellScript(spell_item_arcane_shroud);
+    RegisterSpellScript(spell_item_aura_of_madness);
+    RegisterSpellScript(spell_item_dementia);
     RegisterSpellScript(spell_item_brittle_armor);
-    RegisterAuraScript(spell_item_blessing_of_ancient_kings);
-    RegisterAuraScript(spell_item_valanyr_hammer_of_ancient_kings);
-    RegisterAuraScript(spell_item_deadly_precision);
+    RegisterSpellScript(spell_item_blessing_of_ancient_kings);
+    RegisterSpellScript(spell_item_valanyr_hammer_of_ancient_kings);
+    RegisterSpellScript(spell_item_deadly_precision);
     RegisterSpellScript(spell_item_deadly_precision_dummy);
     new spell_item_deathbringers_will<SPELL_STRENGTH_OF_THE_TAUNKA, SPELL_AGILITY_OF_THE_VRYKUL, SPELL_POWER_OF_THE_TAUNKA, SPELL_AIM_OF_THE_IRON_DWARVES, SPELL_SPEED_OF_THE_VRYKUL>("spell_item_deathbringers_will_normal");
     new spell_item_deathbringers_will<SPELL_STRENGTH_OF_THE_TAUNKA_HERO, SPELL_AGILITY_OF_THE_VRYKUL_HERO, SPELL_POWER_OF_THE_TAUNKA_HERO, SPELL_AIM_OF_THE_IRON_DWARVES_HERO, SPELL_SPEED_OF_THE_VRYKUL_HERO>("spell_item_deathbringers_will_heroic");
@@ -4559,43 +4559,43 @@ void AddSC_item_spell_scripts()
     new spell_item_defibrillate("spell_item_goblin_jumper_cables", 67, SPELL_GOBLIN_JUMPER_CABLES_FAIL);
     new spell_item_defibrillate("spell_item_goblin_jumper_cables_xl", 50, SPELL_GOBLIN_JUMPER_CABLES_XL_FAIL);
     new spell_item_defibrillate("spell_item_gnomish_army_knife", 33);
-    RegisterAuraScript(spell_item_desperate_defense);
+    RegisterSpellScript(spell_item_desperate_defense);
     RegisterSpellScript(spell_item_deviate_fish);
-    RegisterAuraScript(spell_item_discerning_eye_beast_dummy);
+    RegisterSpellScript(spell_item_discerning_eye_beast_dummy);
     RegisterSpellScript(spell_item_echoes_of_light);
-    RegisterAuraScript(spell_item_extract_gas);
-    RegisterAuraScript(spell_item_fate_rune_of_unsurpassed_vigor);
+    RegisterSpellScript(spell_item_extract_gas);
+    RegisterSpellScript(spell_item_fate_rune_of_unsurpassed_vigor);
     RegisterSpellScript(spell_item_flask_of_the_north);
-    RegisterAuraScript(spell_item_frozen_shadoweave);
+    RegisterSpellScript(spell_item_frozen_shadoweave);
     RegisterSpellScript(spell_item_gnomish_death_ray);
-    RegisterAuraScript(spell_item_harm_prevention_belt);
+    RegisterSpellScript(spell_item_harm_prevention_belt);
     new spell_item_heartpierce<SPELL_INVIGORATION_ENERGY, SPELL_INVIGORATION_MANA, SPELL_INVIGORATION_RAGE, SPELL_INVIGORATION_RP>("spell_item_heartpierce");
     new spell_item_heartpierce<SPELL_INVIGORATION_ENERGY_HERO, SPELL_INVIGORATION_MANA_HERO, SPELL_INVIGORATION_RAGE_HERO, SPELL_INVIGORATION_RP_HERO>("spell_item_heartpierce_hero");
-    RegisterAuraScript(spell_item_crystal_spire_of_karabor);
+    RegisterSpellScript(spell_item_crystal_spire_of_karabor);
     RegisterSpellScript(spell_item_make_a_wish);
-    RegisterAuraScript(spell_item_mark_of_conquest);
+    RegisterSpellScript(spell_item_mark_of_conquest);
     RegisterSpellScript(spell_item_mercurial_shield);
     RegisterSpellScript(spell_item_mingos_fortune_generator);
-    RegisterAuraScript(spell_item_necrotic_touch);
+    RegisterSpellScript(spell_item_necrotic_touch);
     RegisterSpellScript(spell_item_net_o_matic);
     RegisterSpellScript(spell_item_noggenfogger_elixir);
-    RegisterAuraScript(spell_item_pendant_of_the_violet_eye);
-    RegisterAuraScript(spell_item_persistent_shield);
-    RegisterAuraScript(spell_item_pet_healing);
+    RegisterSpellScript(spell_item_pendant_of_the_violet_eye);
+    RegisterSpellScript(spell_item_persistent_shield);
+    RegisterSpellScript(spell_item_pet_healing);
     RegisterSpellScript(spell_item_piccolo_of_the_flaming_fire);
-    RegisterAuraScript(spell_item_power_circle);
+    RegisterSpellScript(spell_item_power_circle);
     RegisterSpellScript(spell_item_savory_deviate_delight);
     RegisterSpellScript(spell_item_scroll_of_recall);
     RegisterSpellScript(spell_item_dimensional_ripper_everlook);
     RegisterSpellScript(spell_item_ultrasafe_transporter);
     RegisterSpellScript(spell_item_dimensional_ripper_area52);
-    RegisterAuraScript(spell_item_unsated_craving);
-    RegisterAuraScript(spell_item_shadows_fate);
-    RegisterAuraScript(spell_item_shadowmourne);
-    RegisterAuraScript(spell_item_shadowmourne_soul_fragment);
+    RegisterSpellScript(spell_item_unsated_craving);
+    RegisterSpellScript(spell_item_shadows_fate);
+    RegisterSpellScript(spell_item_shadowmourne);
+    RegisterSpellScript(spell_item_shadowmourne_soul_fragment);
     RegisterSpellScript(spell_item_six_demon_bag);
-    RegisterAuraScript(spell_item_swift_hand_justice_dummy);
-    RegisterAuraScript(spell_item_the_eye_of_diminution);
+    RegisterSpellScript(spell_item_swift_hand_justice_dummy);
+    RegisterSpellScript(spell_item_the_eye_of_diminution);
     RegisterSpellScript(spell_item_underbelly_elixir);
     RegisterSpellScript(spell_item_wormhole_pandaria);
     RegisterSpellScript(spell_item_worn_troll_dice);
@@ -4608,7 +4608,7 @@ void AddSC_item_spell_scripts()
     RegisterSpellScript(spell_item_vanquished_clutches);
 
     RegisterSpellScript(spell_item_ashbringer);
-    RegisterAuraScript(spell_magic_eater_food);
+    RegisterSpellScript(spell_magic_eater_food);
     RegisterSpellScript(spell_item_shimmering_vessel);
     RegisterSpellScript(spell_item_purify_helboar_meat);
     RegisterSpellScript(spell_item_crystal_prison_dummy_dnd);
@@ -4621,7 +4621,7 @@ void AddSC_item_spell_scripts()
     RegisterSpellScript(spell_item_impale_leviroth);
     RegisterSpellScript(spell_item_brewfest_mount_transformation);
     RegisterSpellScript(spell_item_nitro_boosts);
-    RegisterAuraScript(spell_item_nitro_boosts_backfire);
+    RegisterSpellScript(spell_item_nitro_boosts_backfire);
     RegisterSpellScript(spell_item_teach_language);
     RegisterSpellScript(spell_item_rocket_boots);
     RegisterSpellScript(spell_item_runic_healing_injector);
@@ -4632,36 +4632,36 @@ void AddSC_item_spell_scripts()
     RegisterSpellScript(spell_item_greatmothers_soulcatcher);
     new spell_item_shard_of_the_scale<SPELL_PURIFIED_CAUTERIZING_HEAL, SPELL_PURIFIED_SEARING_FLAMES>("spell_item_purified_shard_of_the_scale");
     new spell_item_shard_of_the_scale<SPELL_SHINY_CAUTERIZING_HEAL, SPELL_SHINY_SEARING_FLAMES>("spell_item_shiny_shard_of_the_scale");
-    RegisterAuraScript(spell_item_soul_preserver);
+    RegisterSpellScript(spell_item_soul_preserver);
     new spell_item_sunwell_neck<SPELL_LIGHTS_WRATH, SPELL_ARCANE_BOLT>("spell_item_sunwell_exalted_caster_neck");
     new spell_item_sunwell_neck<SPELL_LIGHTS_STRENGTH, SPELL_ARCANE_STRIKE>("spell_item_sunwell_exalted_melee_neck");
     new spell_item_sunwell_neck<SPELL_LIGHTS_WARD, SPELL_ARCANE_INSIGHT>("spell_item_sunwell_exalted_tank_neck");
     new spell_item_sunwell_neck<SPELL_LIGHTS_SALVATION, SPELL_ARCANE_SURGE>("spell_item_sunwell_exalted_healer_neck");
     RegisterSpellScript(spell_item_toy_train_set_pulse);
-    RegisterAuraScript(spell_item_death_choice);
+    RegisterSpellScript(spell_item_death_choice);
     new spell_item_trinket_stack("spell_item_lightning_capacitor", SPELL_LIGHTNING_CAPACITOR_STACK, SPELL_LIGHTNING_CAPACITOR_TRIGGER);
     new spell_item_trinket_stack("spell_item_thunder_capacitor", SPELL_THUNDER_CAPACITOR_STACK, SPELL_THUNDER_CAPACITOR_TRIGGER);
     new spell_item_trinket_stack("spell_item_toc25_normal_caster_trinket", SPELL_TOC25_CASTER_TRINKET_NORMAL_STACK, SPELL_TOC25_CASTER_TRINKET_NORMAL_TRIGGER);
     new spell_item_trinket_stack("spell_item_toc25_heroic_caster_trinket", SPELL_TOC25_CASTER_TRINKET_HEROIC_STACK, SPELL_TOC25_CASTER_TRINKET_HEROIC_TRIGGER);
-    RegisterAuraScript(spell_item_darkmoon_card_greatness);
-    RegisterAuraScript(spell_item_mana_drain);
+    RegisterSpellScript(spell_item_darkmoon_card_greatness);
+    RegisterSpellScript(spell_item_mana_drain);
     RegisterSpellScript(spell_item_taunt_flag_targeting);
     RegisterSpellScript(spell_item_mirrens_drinking_hat);
     RegisterSpellScript(spell_item_mind_control_cap);
     RegisterSpellScript(spell_item_universal_remote);
     new spell_item_zandalarian_charm("spell_item_unstable_power", SPELL_UNSTABLE_POWER_AURA_STACK);
     new spell_item_zandalarian_charm("spell_item_restless_strength", SPELL_RESTLESS_STRENGTH_AURA_STACK);
-    RegisterAuraScript(spell_item_artifical_stamina);
-    RegisterAuraScript(spell_item_artifical_damage);
-    RegisterAuraScript(spell_item_talisman_of_ascendance);
-    RegisterAuraScript(spell_item_battle_trance);
-    RegisterAuraScript(spell_item_world_queller_focus);
-    RegisterAuraScript(spell_item_water_strider);
-    RegisterAuraScript(spell_item_brutal_kinship);
+    RegisterSpellScript(spell_item_artifical_stamina);
+    RegisterSpellScript(spell_item_artifical_damage);
+    RegisterSpellScript(spell_item_talisman_of_ascendance);
+    RegisterSpellScript(spell_item_battle_trance);
+    RegisterSpellScript(spell_item_world_queller_focus);
+    RegisterSpellScript(spell_item_water_strider);
+    RegisterSpellScript(spell_item_brutal_kinship);
 
     RegisterSpellScript(spell_item_mad_alchemists_potion);
     RegisterSpellScript(spell_item_crazy_alchemists_potion);
     RegisterSpellScript(spell_item_eggnog);
 
-    RegisterAuraScript(spell_item_heart_of_azeroth);
+    RegisterSpellScript(spell_item_heart_of_azeroth);
 }
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 70dce4eb7bc..2b30144149d 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -1217,37 +1217,37 @@ class spell_mage_water_elemental_freeze : public SpellScript
 
 void AddSC_mage_spell_scripts()
 {
-    RegisterAuraScript(spell_mage_alter_time_aura);
+    RegisterSpellScript(spell_mage_alter_time_aura);
     RegisterSpellScript(spell_mage_alter_time_active);
     RegisterSpellScript(spell_mage_arcane_barrage);
     RegisterSpellScript(spell_mage_arcane_charge_clear);
     RegisterSpellScript(spell_mage_arcane_explosion);
-    RegisterAuraScript(spell_mage_blazing_barrier);
-    RegisterAuraScript(spell_mage_burning_determination);
+    RegisterSpellScript(spell_mage_blazing_barrier);
+    RegisterSpellScript(spell_mage_burning_determination);
     RegisterSpellAndAuraScriptPair(spell_mage_cauterize, spell_mage_cauterize_AuraScript);
     RegisterSpellScript(spell_mage_cold_snap);
     RegisterSpellScript(spell_mage_cone_of_cold);
     RegisterSpellScript(spell_mage_conjure_refreshment);
-    RegisterAuraScript(spell_mage_fingers_of_frost);
+    RegisterSpellScript(spell_mage_fingers_of_frost);
     RegisterSpellScript(spell_mage_firestarter);
-    RegisterAuraScript(spell_mage_firestarter_dots);
-    RegisterAuraScript(spell_mage_flame_on);
-    RegisterAuraScript(spell_mage_ice_barrier);
+    RegisterSpellScript(spell_mage_firestarter_dots);
+    RegisterSpellScript(spell_mage_flame_on);
+    RegisterSpellScript(spell_mage_ice_barrier);
     RegisterSpellScript(spell_mage_ice_block);
     RegisterSpellScript(spell_mage_ice_lance);
     RegisterSpellScript(spell_mage_ice_lance_damage);
-    RegisterAuraScript(spell_mage_ignite);
-    RegisterAuraScript(spell_mage_imp_mana_gems);
-    RegisterAuraScript(spell_mage_incanters_flow);
+    RegisterSpellScript(spell_mage_ignite);
+    RegisterSpellScript(spell_mage_imp_mana_gems);
+    RegisterSpellScript(spell_mage_incanters_flow);
     RegisterSpellScript(spell_mage_living_bomb);
     RegisterSpellScript(spell_mage_living_bomb_explosion);
-    RegisterAuraScript(spell_mage_living_bomb_periodic);
+    RegisterSpellScript(spell_mage_living_bomb_periodic);
     RegisterSpellScript(spell_mage_polymorph_visual);
-    RegisterAuraScript(spell_mage_prismatic_barrier);
-    RegisterAuraScript(spell_mage_ring_of_frost);
+    RegisterSpellScript(spell_mage_prismatic_barrier);
+    RegisterSpellScript(spell_mage_ring_of_frost);
     RegisterSpellAndAuraScriptPair(spell_mage_ring_of_frost_freeze, spell_mage_ring_of_frost_freeze_AuraScript);
     RegisterSpellScript(spell_mage_time_warp);
-    RegisterAuraScript(spell_mage_touch_of_the_magi_aura);
+    RegisterSpellScript(spell_mage_touch_of_the_magi_aura);
     RegisterSpellScript(spell_mage_trigger_chilled);
     RegisterSpellScript(spell_mage_water_elemental_freeze);
 }
diff --git a/src/server/scripts/Spells/spell_monk.cpp b/src/server/scripts/Spells/spell_monk.cpp
index 06e06da66cf..3190821f404 100644
--- a/src/server/scripts/Spells/spell_monk.cpp
+++ b/src/server/scripts/Spells/spell_monk.cpp
@@ -389,10 +389,10 @@ private:
 
 void AddSC_monk_spell_scripts()
 {
-    RegisterAuraScript(spell_monk_crackling_jade_lightning);
-    RegisterAuraScript(spell_monk_crackling_jade_lightning_knockback_proc_aura);
+    RegisterSpellScript(spell_monk_crackling_jade_lightning);
+    RegisterSpellScript(spell_monk_crackling_jade_lightning_knockback_proc_aura);
     RegisterSpellScript(spell_monk_provoke);
-    RegisterAuraScript(spell_monk_stagger);
-    RegisterAuraScript(spell_monk_stagger_damage_aura);
-    RegisterAuraScript(spell_monk_stagger_debuff_aura);
+    RegisterSpellScript(spell_monk_stagger);
+    RegisterSpellScript(spell_monk_stagger_damage_aura);
+    RegisterSpellScript(spell_monk_stagger_debuff_aura);
 }
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 9f7cab4d949..a4422b84949 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -1310,14 +1310,14 @@ void AddSC_paladin_spell_scripts()
     //new spell_pal_ardent_defender();
     RegisterSpellScript(spell_pal_blessing_of_protection);
     RegisterSpellScript(spell_pal_blinding_light);
-    RegisterAuraScript(spell_pal_crusader_might);
-    RegisterAuraScript(spell_pal_consecration);
+    RegisterSpellScript(spell_pal_crusader_might);
+    RegisterSpellScript(spell_pal_consecration);
     RegisterAreaTriggerAI(areatrigger_pal_consecration);
     RegisterSpellScript(spell_pal_divine_shield);
     RegisterSpellScript(spell_pal_divine_steed);
     RegisterSpellScript(spell_pal_divine_storm);
-    RegisterAuraScript(spell_pal_eye_for_an_eye);
-    RegisterAuraScript(spell_pal_fist_of_justice);
+    RegisterSpellScript(spell_pal_eye_for_an_eye);
+    RegisterSpellScript(spell_pal_fist_of_justice);
     RegisterSpellScript(spell_pal_glyph_of_holy_light);
     new spell_pal_grand_crusader();
     new spell_pal_hand_of_sacrifice();
@@ -1329,15 +1329,15 @@ void AddSC_paladin_spell_scripts()
     RegisterSpellScript(spell_pal_holy_shock);
     RegisterSpellScript(spell_pal_holy_shock_damage_visual);
     RegisterSpellScript(spell_pal_holy_shock_heal_visual);
-    RegisterAuraScript(spell_pal_item_healing_discount);
-    RegisterAuraScript(spell_pal_item_t6_trinket);
+    RegisterSpellScript(spell_pal_item_healing_discount);
+    RegisterSpellScript(spell_pal_item_t6_trinket);
     RegisterSpellScript(spell_pal_lay_on_hands);
     new spell_pal_light_s_beacon();
-    RegisterAuraScript(spell_pal_righteous_protector);
-    RegisterAuraScript(spell_pal_righteous_verdict);
-    RegisterAuraScript(spell_pal_selfless_healer);
+    RegisterSpellScript(spell_pal_righteous_protector);
+    RegisterSpellScript(spell_pal_righteous_verdict);
+    RegisterSpellScript(spell_pal_selfless_healer);
     RegisterSpellScript(spell_pal_templar_s_verdict);
     new spell_pal_t3_6p_bonus();
     new spell_pal_t8_2p_bonus();
-    RegisterAuraScript(spell_pal_zeal);
+    RegisterSpellScript(spell_pal_zeal);
 }
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index f1bb033cf2c..fb32333a9a5 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -1431,20 +1431,20 @@ void AddSC_priest_spell_scripts()
     new spell_pri_atonement_triggered();
     new spell_pri_divine_hymn();
     new spell_pri_guardian_spirit();
-    RegisterAuraScript(spell_pri_holy_words);
+    RegisterSpellScript(spell_pri_holy_words);
     new spell_pri_item_t6_trinket();
     new spell_pri_leap_of_faith_effect_trigger();
     new spell_pri_levitate();
-    RegisterAuraScript(spell_pri_mind_bomb);
+    RegisterSpellScript(spell_pri_mind_bomb);
     new spell_pri_penance();
     RegisterSpellScript(spell_pri_power_word_radiance);
     new spell_pri_power_word_shield();
     RegisterSpellScript(spell_pri_prayer_of_mending);
-    RegisterAuraScript(spell_pri_prayer_of_mending_aura);
+    RegisterSpellScript(spell_pri_prayer_of_mending_aura);
     RegisterSpellScript(spell_pri_prayer_of_mending_jump);
-    RegisterAuraScript(spell_pri_spirit_of_redemption);
+    RegisterSpellScript(spell_pri_spirit_of_redemption);
     RegisterSpellScript(spell_pri_shadow_mend);
-    RegisterAuraScript(spell_pri_shadow_mend_periodic_damage);
+    RegisterSpellScript(spell_pri_shadow_mend_periodic_damage);
     new spell_pri_t3_4p_bonus();
     new spell_pri_t5_heal_2p_bonus();
     new spell_pri_t10_heal_2p_bonus();
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index 2aeca094149..698335bbff0 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -3077,8 +3077,8 @@ void AddSC_quest_spell_scripts()
     new spell_q13011_bear_flank_master();
     new spell_q13086_cannons_target();
     RegisterSpellScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576);
-    RegisterAuraScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579);
-    RegisterAuraScript(spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death);
+    RegisterSpellScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579);
+    RegisterSpellScript(spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death);
     RegisterSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom);
     RegisterSpellScript(spell_q13264_q13276_q13288_q13289_assign_credit_to_master);
     RegisterSpellScript(spell_q12690_burst_at_the_seams_52510);
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index 3ba959a8668..852b1613f59 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -1054,23 +1054,23 @@ void AddSC_rogue_spell_scripts()
     RegisterSpellScript(spell_rog_backstab);
     new spell_rog_blade_flurry();
     new spell_rog_deadly_poison();
-    RegisterAuraScript(spell_rog_grand_melee);
+    RegisterSpellScript(spell_rog_grand_melee);
     new spell_rog_killing_spree();
-    RegisterAuraScript(spell_rog_mastery_main_gauche);
-    RegisterAuraScript(spell_rog_restless_blades);
+    RegisterSpellScript(spell_rog_mastery_main_gauche);
+    RegisterSpellScript(spell_rog_restless_blades);
     RegisterSpellScript(spell_rog_roll_the_bones);
     new spell_rog_rupture();
-    RegisterAuraScript(spell_rog_ruthlessness);
+    RegisterSpellScript(spell_rog_ruthlessness);
     RegisterSpellScript(spell_rog_shadowstrike);
     RegisterSpellScript(spell_rog_sinister_strike);
-    RegisterAuraScript(spell_rog_stealth);
+    RegisterSpellScript(spell_rog_stealth);
     RegisterSpellScript(spell_rog_symbols_of_death);
     RegisterSpellScript(spell_rog_vanish);
-    RegisterAuraScript(spell_rog_vanish_aura);
+    RegisterSpellScript(spell_rog_vanish_aura);
     RegisterSpellAndAuraScriptPair(spell_rog_tricks_of_the_trade, spell_rog_tricks_of_the_trade_aura);
-    RegisterAuraScript(spell_rog_tricks_of_the_trade_proc);
+    RegisterSpellScript(spell_rog_tricks_of_the_trade_proc);
     new spell_rog_honor_among_thieves();
     new spell_rog_eviscerate();
     new spell_rog_envenom();
-    RegisterAuraScript(spell_rog_venomous_wounds);
+    RegisterSpellScript(spell_rog_venomous_wounds);
 }
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index 49643977b06..a3967af2738 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -1735,53 +1735,53 @@ private:
 
 void AddSC_shaman_spell_scripts()
 {
-    RegisterAuraScript(spell_sha_aftershock);
-    RegisterAuraScript(spell_sha_ancestral_guidance);
+    RegisterSpellScript(spell_sha_aftershock);
+    RegisterSpellScript(spell_sha_ancestral_guidance);
     RegisterSpellScript(spell_sha_ancestral_guidance_heal);
     RegisterSpellScript(spell_sha_bloodlust);
     RegisterSpellScript(spell_sha_chain_lightning);
     RegisterSpellScript(spell_sha_chain_lightning_overload);
     RegisterSpellScript(spell_sha_crash_lightning);
     RegisterSpellScript(spell_sha_downpour);
-    RegisterAuraScript(spell_sha_earth_shield);
-    RegisterAuraScript(spell_sha_earthen_rage_passive);
-    RegisterAuraScript(spell_sha_earthen_rage_proc_aura);
+    RegisterSpellScript(spell_sha_earth_shield);
+    RegisterSpellScript(spell_sha_earthen_rage_passive);
+    RegisterSpellScript(spell_sha_earthen_rage_proc_aura);
     RegisterAreaTriggerAI(areatrigger_sha_earthquake);
     RegisterSpellScript(spell_sha_earthquake_tick);
     RegisterSpellScript(spell_sha_elemental_blast);
     RegisterSpellScript(spell_sha_flametongue_weapon);
-    RegisterAuraScript(spell_sha_flametongue_weapon_aura);
+    RegisterSpellScript(spell_sha_flametongue_weapon_aura);
     RegisterSpellAndAuraScriptPair(spell_sha_healing_rain, spell_sha_healing_rain_aura);
     RegisterSpellScript(spell_sha_healing_rain_target_limit);
     RegisterSpellScript(spell_sha_healing_stream_totem_heal);
     RegisterSpellScript(spell_sha_heroism);
-    RegisterAuraScript(spell_sha_item_lightning_shield);
-    RegisterAuraScript(spell_sha_item_lightning_shield_trigger);
-    RegisterAuraScript(spell_sha_item_mana_surge);
-    RegisterAuraScript(spell_sha_item_t6_trinket);
-    RegisterAuraScript(spell_sha_item_t10_elemental_2p_bonus);
-    RegisterAuraScript(spell_sha_item_t18_elemental_4p_bonus);
+    RegisterSpellScript(spell_sha_item_lightning_shield);
+    RegisterSpellScript(spell_sha_item_lightning_shield_trigger);
+    RegisterSpellScript(spell_sha_item_mana_surge);
+    RegisterSpellScript(spell_sha_item_t6_trinket);
+    RegisterSpellScript(spell_sha_item_t10_elemental_2p_bonus);
+    RegisterSpellScript(spell_sha_item_t18_elemental_4p_bonus);
     RegisterSpellScript(spell_sha_lava_burst);
     RegisterSpellScript(spell_sha_lava_crit_chance);
-    RegisterAuraScript(spell_sha_lava_surge);
+    RegisterSpellScript(spell_sha_lava_surge);
     RegisterSpellScript(spell_sha_lava_surge_proc);
     RegisterSpellScript(spell_sha_lightning_bolt);
     RegisterSpellScript(spell_sha_lightning_bolt_overload);
     RegisterSpellScript(spell_sha_liquid_magma_totem);
-    RegisterAuraScript(spell_sha_mastery_elemental_overload);
+    RegisterSpellScript(spell_sha_mastery_elemental_overload);
     RegisterSpellScript(spell_sha_mastery_elemental_overload_proc);
-    RegisterAuraScript(spell_sha_natures_guardian);
+    RegisterSpellScript(spell_sha_natures_guardian);
     RegisterSpellScript(spell_sha_path_of_flames_spread);
-    RegisterAuraScript(spell_sha_spirit_wolf);
-    RegisterAuraScript(spell_sha_tidal_waves);
-    RegisterAuraScript(spell_sha_t3_6p_bonus);
-    RegisterAuraScript(spell_sha_t3_8p_bonus);
-    RegisterAuraScript(spell_sha_t8_elemental_4p_bonus);
-    RegisterAuraScript(spell_sha_t9_elemental_4p_bonus);
-    RegisterAuraScript(spell_sha_t10_elemental_4p_bonus);
-    RegisterAuraScript(spell_sha_t10_restoration_4p_bonus);
-    RegisterAuraScript(spell_sha_unlimited_power);
+    RegisterSpellScript(spell_sha_spirit_wolf);
+    RegisterSpellScript(spell_sha_tidal_waves);
+    RegisterSpellScript(spell_sha_t3_6p_bonus);
+    RegisterSpellScript(spell_sha_t3_8p_bonus);
+    RegisterSpellScript(spell_sha_t8_elemental_4p_bonus);
+    RegisterSpellScript(spell_sha_t9_elemental_4p_bonus);
+    RegisterSpellScript(spell_sha_t10_elemental_4p_bonus);
+    RegisterSpellScript(spell_sha_t10_restoration_4p_bonus);
+    RegisterSpellScript(spell_sha_unlimited_power);
     RegisterSpellScript(spell_sha_windfury_weapon);
-    RegisterAuraScript(spell_sha_windfury_weapon_proc);
+    RegisterSpellScript(spell_sha_windfury_weapon_proc);
     RegisterAreaTriggerAI(areatrigger_sha_wind_rush_totem);
 }
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 03c1c2d2a29..085b1d81575 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -1070,12 +1070,12 @@ void AddSC_warlock_spell_scripts()
 {
     new spell_warl_banish();
     RegisterSpellScript(spell_warl_chaos_bolt);
-    RegisterAuraScript(spell_warl_chaotic_energies);
+    RegisterSpellScript(spell_warl_chaotic_energies);
     new spell_warl_create_healthstone();
     new spell_warl_demonic_circle_summon();
     new spell_warl_demonic_circle_teleport();
     new spell_warl_devour_magic();
-    RegisterAuraScript(spell_warl_drain_soul);
+    RegisterSpellScript(spell_warl_drain_soul);
     new spell_warl_haunt();
     new spell_warl_health_funnel();
     new spell_warl_healthstone_heal();