diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index 331561e178..3cea78dfde 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -413,11 +413,11 @@ SET(trinityscript_LIB_SRCS
    scripts/zone/nexus/oculus/boss_varos.cpp
    scripts/zone/nexus/oculus/boss_eregos.cpp
    scripts/zone/nexus/oculus/def_oculus.h
-   scripts/zone/azjol_nerub/azjol-nerub/instance_azjol-nerub.cpp
+   scripts/zone/azjol-nerub/azjol-nerub/instance_azjol_nerub.cpp
    scripts/zone/azjol-nerub/azjol-nerub/boss_krik_thir.cpp
    scripts/zone/azjol-nerub/azjol-nerub/boss_hadronox.cpp
    scripts/zone/azjol-nerub/azjol-nerub/boss_anub_arak.cpp
-   scripts/zone/azjol-nerub/azjol-nerub/def_azjol-nerub.h
+   scripts/zone/azjol-nerub/azjol-nerub/def_azjol_nerub.h
    scripts/zone/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
    scripts/zone/azjol-nerub/ahnkahet/boss_taldaram.cpp
    scripts/zone/azjol-nerub/ahnkahet/boss_nadox.cpp
@@ -425,12 +425,12 @@ SET(trinityscript_LIB_SRCS
    scripts/zone/azjol-nerub/ahnkahet/boss_volazj.cpp
    scripts/zone/azjol-nerub/ahnkahet/boss_aminitar.cpp
    scripts/zone/azjol-nerub/ahnkahet/def_ahnkahet.h
-   scripts/zone/draktharon_keep/instance_draktharon_keep.cpp
+   scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
    scripts/zone/draktharon_keep/boss_trollgore.cpp
    scripts/zone/draktharon_keep/boss_novos.cpp
    scripts/zone/draktharon_keep/boss_dred.cpp
    scripts/zone/draktharon_keep/boss_tharon_ja.cpp
-   scripts/zone/draktharon_keep/def_draktharon_keep.h
+   scripts/zone/draktharon_keep/def_drak_tharon_keep.h
    scripts/zone/violet_hold/instance_violet_hold.cpp
    scripts/zone/violet_hold/boss_cyanigosa.cpp
    scripts/zone/violet_hold/boss_erekem.cpp
@@ -471,7 +471,7 @@ SET(trinityscript_LIB_SRCS
    scripts/zone/obsidian_sanctum/boss_sartharion.cpp
    scripts/zone/obsidian_sanctum/def_obsidian_sanctum.h
    scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
-   scripts/zone/vault_of_archavon/boss_vault_of_archavon.cpp
+   scripts/zone/vault_of_archavon/boss_archavon.cpp
    scripts/zone/vault_of_archavon/def_vault_of_archavon.h
    system.cpp
 )
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index d2629224f6..7f3699d76c 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -875,10 +875,6 @@
 							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_anubarak.cpp"
 							>
 						</File>
-						<File
-							RelativePath="..\scripts\zone\azjol-nerub\azjol-nerub\boss_hadronox.cpp"
-							>
-						</File>
 						<File
 							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_hadronox.cpp"
 							>
@@ -891,10 +887,6 @@
 							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_krikthir_the_gatewatcher.cpp"
 							>
 						</File>
-						<File
-							RelativePath="..\scripts\zone\azjol-nerub\azjol-nerub\def_azjol-nerub.h"
-							>
-						</File>
 						<File
 							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\def_azjol_nerub.h"
 							>
@@ -1167,10 +1159,6 @@
 							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
 							>
 						</File>
-						<File
-							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
-							>
-						</File>
 						<File
 							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald.cpp"
 							>
diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol-nerub.h b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol-nerub.h
deleted file mode 100644
index 56223b7b44..0000000000
--- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol-nerub.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef DEF_AZJOL_NERUB_H
-#define DEF_AZJOL_NERUB_H
-
-#endif
diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol-nerub.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol-nerub.cpp
deleted file mode 100644
index 2267735df3..0000000000
--- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol-nerub.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "precompiled.h"
-#include "def_azjol-nerub.h"
-
-struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
-{
-    instance_azjol_nerub(Map *Map) : ScriptedInstance(Map) {Initialize();};
-};
-
-InstanceData* GetInstanceData_instance_azjol_nerub(Map* map)
-{
-    return new instance_azjol_nerub(map);
-}
-
-void AddSC_instance_azjol_nerub()
-{
-    Script *newscript;
-    newscript = new Script;
-    newscript->Name = "instance_azjol_nerub";
-    newscript->GetInstanceData = GetInstanceData_instance_azjol_nerub;
-    newscript->RegisterSelf();
-}