Scripts: minimize duplicated enum names in header files (#19377)

* Scripts: Minimize duplicated enum names in header files

This reduces the number of cache resets with the Zapcc compiler

- Standard followed is instance/raid TLA + DataTypes/CreaturesIds/etc
- Partial cherry-pick of master commit 7eb4512eee5fc04994e2aa55126ccc97a8393506
- Removed unused defines in sunken_temple.h (the core scripts using these have been moved to SAI)

19 files changed, 53 insertions, 73 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
index a8b8e1297e8..18354890ba9 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
@@ -23,21 +23,13 @@
 
 uint32 const EncounterCount = 2;
 
-enum DataTypes
+enum ACDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_SHIRRAK_THE_DEAD_WATCHER   = 0,
     DATA_EXARCH_MALADAAR            = 1
 };
 
-enum CreatureIds
-{
-};
-
-enum GameObjectIds
-{
-};
-
 template<class AI>
 AI* GetAuchenaiCryptsAI(Creature* creature)
 {
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
index 0360946eeab..707eb89ef9b 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount = 4;
 
-enum DataTypes
+enum MTDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_PANDEMONIUS            = 0,
@@ -32,14 +32,6 @@ enum DataTypes
     DATA_YOR                    = 3
 };
 
-enum CreatureIds
-{
-};
-
-enum GameObjectIds
-{
-};
-
 template<class AI>
 AI* GetManaTombsAI(Creature* creature)
 {
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
index 4412d982159..3471b23daa2 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount             = 3;
 
-enum DataTypes
+enum SHDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_DARKWEAVER_SYTH                = 0,
@@ -34,13 +34,13 @@ enum DataTypes
     DATA_TALON_KING_COFFER              = 3
 };
 
-enum CreatureIds
+enum SHCreatureIds
 {
     NPC_ANZU                            = 23035,
     NPC_BROOD_OF_ANZU                   = 23132
 };
 
-enum GameObjectIds
+enum SHGameObjectIds
 {
     GO_IKISS_DOOR                       = 177203,
     GO_TALON_KING_COFFER                = 187372
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
index d0f2fc21a28..48334af4ab9 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount = 4;
 
-enum DataTypes
+enum SLDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_AMBASSADOR_HELLMAW             = 0,
@@ -35,20 +35,20 @@ enum DataTypes
     DATA_FEL_OVERSEER                   = 4
 };
 
-enum CreatureIds
+enum SLCreatureIds
 {
     NPC_AMBASSADOR_HELLMAW              = 18731,
     NPC_GRANDMASTER_VORPIL              = 18732,
     NPC_FEL_OVERSEER                    = 18796
 };
 
-enum GameObjectIds
+enum SLGameObjectIds
 {
     GO_REFECTORY_DOOR                   = 183296, // door opened when blackheart the inciter dies
     GO_SCREAMING_HALL_DOOR              = 183295  // door opened when grandmaster vorpil dies
 };
 
-enum Misc
+enum SLMisc
 {
     ACTION_AMBASSADOR_HELLMAW_INTRO     = 1,
     ACTION_AMBASSADOR_HELLMAW_BANISH    = 2,
@@ -61,4 +61,3 @@ AI* GetShadowLabyrinthAI(Creature* creature)
 }
 
 #endif // SHADOW_LABYRINTH_H_
-
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index 9b2feb8b42b..745038961b9 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount         = 9;
 
-enum DataTypes
+enum BTDataTypes
 {
     // Encounter States
     DATA_HIGH_WARLORD_NAJENTUS      = 0,
@@ -65,7 +65,7 @@ enum TriggerEmotes
     EMOTE_DEN_OF_MORTAL_DOOR_OPEN    = 1
 };
 
-enum CreatureIds
+enum BTCreatureIds
 {
     //Bosses
     NPC_HIGH_WARLORD_NAJENTUS       = 22887,
@@ -109,7 +109,7 @@ enum CreatureIds
     NPC_DEMON_FIRE                  = 23069
 };
 
-enum GameObjectIds
+enum BTGameObjectIds
 {
     GO_NAJENTUS_GATE                = 185483,
     GO_NAJENTUS_SPINE               = 185584,
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 98b719c1f01..b9aad29f63d 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -198,7 +198,7 @@ class instance_black_temple : public InstanceMapScript
 
             bool CheckDenOfMortalDoor()
             {
-                for (DataTypes boss : {DATA_SHADE_OF_AKAMA, DATA_TERON_GOREFIEND, DATA_RELIQUARY_OF_SOULS, DATA_GURTOGG_BLOODBOIL})
+                for (BTDataTypes boss : {DATA_SHADE_OF_AKAMA, DATA_TERON_GOREFIEND, DATA_RELIQUARY_OF_SOULS, DATA_GURTOGG_BLOODBOIL})
                     if (GetBossState(boss) != DONE)
                         return false;
                 return true;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
index 6c34e9ef948..0fe6a947e05 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -21,14 +21,14 @@
 
 #define DataHeader "SS"
 
-enum WaterEventState
+enum SSWaterEventState
 {
     WATERSTATE_NONE     = 0,
     WATERSTATE_FRENZY   = 1,
     WATERSTATE_SCALDING = 2
 };
 
-enum DataTypes
+enum SSDataTypes
 {
     DATA_CANSTARTPHASE3             = 1,
     DATA_CARIBDIS                   = 2,
@@ -58,4 +58,3 @@ enum DataTypes
 };
 
 #endif
-
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
index 3902b806e22..30f9f34a5da 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount = 3;
 
-enum DataTypes
+enum SVDataTypes
 {
     DATA_HYDROMANCER_THESPIA        = 0,
     DATA_MEKGINEER_STEAMRIGGER      = 1,
@@ -35,14 +35,14 @@ enum DataTypes
     DATA_ACCESS_PANEL_MEK           = 5
 };
 
-enum CreatureIds
+enum SVCreatureIds
 {
     NPC_HYDROMANCER_THESPIA         = 17797,
     NPC_MEKGINEER_STEAMRIGGER       = 17796,
     NPC_WARLORD_KALITHRESH          = 17798
 };
 
-enum GameObjectIds
+enum SVGameObjectIds
 {
     GO_MAIN_CHAMBERS_DOOR           = 183049,
     GO_ACCESS_PANEL_HYDRO           = 184125,
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
index 21ab63f25e7..9b22d61f4e7 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
@@ -23,7 +23,7 @@ uint32 const EncounterCount               = 3;
 #define SPScriptName "instance_the_slave_pens"
 #define DataHeader "SP"
 
-enum DataTypes
+enum SPDataTypes
 {
     DATA_MENNU_THE_BETRAYER               = 1,
     DATA_ROKMAR_THE_CRACKLER              = 2,
@@ -43,7 +43,7 @@ enum DataTypes
     DATA_LUMA_SKYMOTHER                   = 16
 };
 
-enum CreaturesIds
+enum SPCreaturesIds
 {
     NPC_AHUNE                            = 25740,
     NPC_FROZEN_CORE                      = 25865,
@@ -60,7 +60,7 @@ enum CreaturesIds
     NPC_WHISP_SOURCE_BUNNY               = 26121
 };
 
-enum GameObjectIds
+enum SPGameObjectIds
 {
     GO_ICE_SPEAR                         = 188077,
     GO_ICE_STONE                         = 187882
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
index 1611ae3a26f..dd9017d780d 100644
--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -23,14 +23,14 @@
 
 uint32 const EncounterCount = 2;
 
-enum DataTypes
+enum GLDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_MAULGAR                = 0,
     DATA_GRUUL                  = 1
 };
 
-enum CreatureIds
+enum GLCreatureIds
 {
     NPC_MAULGAR                 = 18831,
     NPC_KROSH_FIREHAND          = 18832,
@@ -39,7 +39,7 @@ enum CreatureIds
     NPC_BLINDEYE_THE_SEER       = 18836
 };
 
-enum GameObjectIds
+enum GLGameObjectIds
 {
     GO_MAULGAR_DOOR             = 184468,
     GO_GRUUL_DOOR               = 184662
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
index 4f516732ee3..4c05bde00cb 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount = 3;
 
-enum DataTypes
+enum BFDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_THE_MAKER              = 0,
@@ -43,7 +43,7 @@ enum DataTypes
     DATA_BROGGOK_LEVER          = 12
 };
 
-enum CreatureIds
+enum BFCreatureIds
 {
     NPC_THE_MAKER               = 17381,
     NPC_BROGGOK                 = 17380,
@@ -52,7 +52,7 @@ enum CreatureIds
     NPC_BROGGOK_POISON_CLOUD    = 17662
 };
 
-enum GameObjectIds
+enum BFGameObjectIds
 {
     GO_PRISON_DOOR_01           = 181766, // Final Exit Door
     GO_PRISON_DOOR_02           = 181811, // The Maker Front Door
@@ -73,7 +73,7 @@ enum GameObjectIds
     GO_BROGGOK_LEVER            = 181982
 };
 
-enum ActionIds
+enum BFActionIds
 {
     ACTION_ACTIVATE_BROGGOK     = 1,
     ACTION_RESET_BROGGOK        = 2,
@@ -87,4 +87,3 @@ AI* GetBloodFurnaceAI(Creature* creature)
 }
 
 #endif // BLOOD_FURNACE_H_
-
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index b0ef9ba9dbd..620f4018f6d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount       = 4;
 
-enum DataTypes
+enum HRDataTypes
 {
     DATA_WATCHKEEPER_GARGOLMAR    = 0,
     DATA_OMOR_THE_UNSCARRED       = 1,
@@ -31,7 +31,7 @@ enum DataTypes
     DATA_NAZAN                    = 3
 };
 
-enum CreatureIds
+enum HRCreatureIds
 {
     NPC_HELLFIRE_SENTRY           = 17517,
     NPC_VAZRUDEN_HERALD           = 17307,
@@ -40,7 +40,7 @@ enum CreatureIds
     NPC_LIQUID_FIRE               = 22515
 };
 
-enum GameobjectIds
+enum HRGameobjectIds
 {
     GO_FEL_IRON_CHEST_NORMAL      = 185168,
     GO_FEL_IRON_CHEST_HEROIC      = 185169
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index 7cf5174bc40..15b40fefcc4 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -51,7 +51,7 @@ ObjectData const gameObjectData[] =
     { 0,                            0                           } //END
 };
 
-static DataTypes const collapseObjectDatas[] =
+static MLDataTypes const collapseObjectDatas[] =
 {
     DATA_MAGTHERIDON_COLUMN_0,
     DATA_MAGTHERIDON_COLUMN_1,
@@ -112,7 +112,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                             HandleGameObject(ObjectGuid::Empty, value == ACTION_ENABLE ? true : false, hall);
                         break;
                     case DATA_COLLAPSE_2:
-                        for (DataTypes data : collapseObjectDatas)
+                        for (MLDataTypes data : collapseObjectDatas)
                             if (GameObject* go = GetGameObject(data))
                                 HandleGameObject(ObjectGuid::Empty, value == ACTION_ENABLE ? true : false, go);
                         break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index d61001dab74..7ed1ab9ebaa 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -22,7 +22,7 @@
 
 uint32 const EncounterCount = 1;
 
-enum DataTypes
+enum MLDataTypes
 {
     DATA_MAGTHERIDON          = 0,
     DATA_WORLD_TRIGGER        = 1,
@@ -39,13 +39,13 @@ enum DataTypes
     DATA_CALL_WARDERS         = 12
 };
 
-enum Actions
+enum MLActions
 {
     ACTION_ENABLE             = 1,
     ACTION_DISABLE            = 2
 };
 
-enum CreatureIds
+enum MLCreatureIds
 {
     NPC_MAGTHERIDON          = 17257,
     NPC_ABYSSAL              = 17454,
@@ -58,7 +58,7 @@ enum CreatureIds
     NPC_HELLFIRE_WARDER      = 18829
 };
 
-enum GameObjectIds
+enum MLGameObjectIds
 {
     GO_MAGTHERIDON_DOOR      = 183847,
     GO_MANTICRON_CUBE        = 181713,
@@ -72,4 +72,3 @@ enum GameObjectIds
 };
 
 #endif
-
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index 021bfa37189..d62746e098f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -24,7 +24,7 @@
 uint32 const EncounterCount          = 4;
 uint32 const VictimCount             = 3;
 
-enum DataTypes
+enum SHDataTypes
 {
     DATA_NETHEKURSE                  = 0,
     DATA_OMROGG                      = 1,
@@ -40,7 +40,7 @@ enum DataTypes
     DATA_THIRD_PRISONER
 };
 
-enum CreatureIds
+enum SHCreatureIds
 {
     NPC_GRAND_WARLOCK_NETHEKURSE     = 16807,
     NPC_KARGATH_BLADEFIST            = 16808,
@@ -62,19 +62,19 @@ enum CreatureIds
     NPC_HORDE_VICTIM_2               = 17297
 };
 
-enum GameobjectIds
+enum SHGameobjectIds
 {
     GO_GRAND_WARLOCK_CHAMBER_DOOR_1  = 182539,
     GO_GRAND_WARLOCK_CHAMBER_DOOR_2  = 182540
 };
 
-enum QuestIds
+enum SHQuestIds
 {
     QUEST_IMPRISONED_A               = 9524,
     QUEST_IMPRISONED_H               = 9525
 };
 
-enum InstanceSpells
+enum SHInstanceSpells
 {
     SPELL_KARGATH_EXECUTIONER_1      = 39288,
     SPELL_KARGATH_EXECUTIONER_2      = 39289,
@@ -83,7 +83,7 @@ enum InstanceSpells
     SPELL_REMOVE_KARGATH_EXECUTIONER = 39291
 };
 
-enum Actions
+enum SHActions
 {
     ACTION_EXECUTIONER_TAUNT = 1
 };
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
index d356617c4b0..1111e2409f5 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount = 4;
 
-enum DataTypes
+enum TEDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_KAELTHAS                       = 0,
@@ -43,7 +43,7 @@ enum DataTypes
     DATA_TEMPEST_BRIDGE_WINDOW          = 11
 };
 
-enum CreatureIds
+enum TECreatureIds
 {
     NPC_SANGUINAR                       = 20060,
     NPC_CAPERNIAN                       = 20062,
@@ -54,7 +54,7 @@ enum CreatureIds
     NPC_ALAR                            = 19514
 };
 
-enum GameObjectIds
+enum TEGameObjectIds
 {
     GO_TEMPEST_BRIDDGE_WINDOW           = 184069,
     GO_KAEL_STATUE_RIGHT                = 184596,
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
index 2821be250fb..35494c745f8 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
@@ -22,7 +22,7 @@
 
 uint32 const EncounterCount             = 5;
 
-enum DataTypes
+enum MRDataTypes
 {
     DATA_GATEWATCHER_GYROKILL           = 0,
     DATA_GATEWATCHER_IRON_HAND          = 1,
@@ -31,7 +31,7 @@ enum DataTypes
     DATA_PATHALEON_THE_CALCULATOR       = 4
 };
 
-enum GameobjectIds
+enum MRGameobjectIds
 {
     GO_DOOR_MOARG_1                     = 184632,
     GO_DOOR_MOARG_2                     = 184322,
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
index 479172879d0..038dfb16067 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount = 4;
 
-enum DataTypes
+enum AZDataTypes
 {
     // Encounter States/Boss GUIDs
     DATA_ZEREKETH                               = 0,
@@ -42,7 +42,7 @@ enum DataTypes
     DATA_WARDENS_SHIELD                         = 11
 };
 
-enum CreatureIds
+enum AZCreatureIds
 {
     NPC_DALLIAH                                 = 20885,
     NPC_SOCCOTHRATES                            = 20886,
@@ -50,7 +50,7 @@ enum CreatureIds
     NPC_ALPHA_POD_TARGET                        = 21436
 };
 
-enum GameObjectIds
+enum AZGameObjectIds
 {
     GO_CONTAINMENT_CORE_SECURITY_FIELD_ALPHA    = 184318, // door opened when Wrath-Scryer Soccothrates dies
     GO_CONTAINMENT_CORE_SECURITY_FIELD_BETA     = 184319, // door opened when Dalliah the Doomsayer dies
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
index d6ceeeaedbc..fc773d0b133 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
+++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
@@ -23,7 +23,7 @@
 
 uint32 const EncounterCount = 5;
 
-enum DataTypes
+enum BCDataTypes
 {
     DATA_COMMANDER_SARANNIS             = 0,
     DATA_HIGH_BOTANIST_FREYWINN         = 1,
@@ -32,7 +32,7 @@ enum DataTypes
     DATA_WARP_SPLINTER                  = 4
 };
 
-enum CreatureIds
+enum BCCreatureIds
 {
     NPC_COMMANDER_SARANNIS              = 17976,
     NPC_HIGH_BOTANIST_FREYWINN          = 17975,