diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt
index bbdbe396a95..15faf9dfb83 100644
--- a/src/server/scripts/EasternKingdoms/CMakeLists.txt
+++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt
@@ -71,7 +71,7 @@ set(scripts_STAT_SRCS
   EasternKingdoms/ScarletEnclave/chapter2.cpp
   EasternKingdoms/ScarletEnclave/chapter5.cpp
   EasternKingdoms/ScarletEnclave/chapter1.cpp
-  EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+  EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
   EasternKingdoms/zone_eastern_plaguelands.cpp
   EasternKingdoms/MoltenCore/boss_gehennas.cpp
   EasternKingdoms/MoltenCore/boss_lucifron.cpp
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
rename to src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt
index 18549a1bf70..1da1e4ab178 100644
--- a/src/server/scripts/Northrend/CMakeLists.txt
+++ b/src/server/scripts/Northrend/CMakeLists.txt
@@ -78,8 +78,8 @@ set(scripts_STAT_SRCS
   Northrend/Nexus/Oculus/boss_urom.cpp
   Northrend/Nexus/Oculus/oculus.cpp
   Northrend/Nexus/Oculus/instance_oculus.cpp
-  Northrend/Nexus/Nexus/commander_kolurg.cpp
-  Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+  Northrend/Nexus/Nexus/boss_commander_kolurg.cpp
+  Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
   Northrend/Nexus/Nexus/boss_ormorok.cpp
   Northrend/Nexus/Nexus/boss_magus_telestra.cpp
   Northrend/Nexus/Nexus/instance_nexus.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp