diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h
index 0237bb3e4..d47879ea4 100644
--- a/src/game/ItemPrototype.h
+++ b/src/game/ItemPrototype.h
@@ -140,7 +140,7 @@ enum ItemFlags2
     ITEM_FLAGS2_NEED_ROLL_DISABLED            = 0x00000100, // need roll during looting is not allowed for this item
 };
 
-enum BAG_FAMILY_MASK
+enum BagFamilyMask
 {
     BAG_FAMILY_MASK_NONE                      = 0x00000000,
     BAG_FAMILY_MASK_ARROWS                    = 0x00000001,
diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h
index d57e1d540..353c4c237 100644
--- a/src/game/SpellAuraDefines.h
+++ b/src/game/SpellAuraDefines.h
@@ -20,7 +20,7 @@
 
 #define MAX_AURAS 64                                        // client support up to 255, but it will cause problems with group auras updating
 
-enum AURA_FLAGS
+enum AuraFlags
 {
     AFLAG_NONE              = 0x00,
     AFLAG_EFF_INDEX_0       = 0x01,
@@ -33,13 +33,6 @@ enum AURA_FLAGS
     AFLAG_NEGATIVE          = 0x80
 };
 
-//m_schoolAbsorb
-enum DAMAGE_ABSORB_TYPE
-{
-    ALL_DAMAGE_ABSORB       = -2,
-    ONLY_MAGIC_ABSORB       = -1,
-};
-
 enum AuraType
 {
     SPELL_AURA_NONE = 0,
diff --git a/src/game/UnitEvents.h b/src/game/UnitEvents.h
index 199b9c038..5a1ab80b5 100644
--- a/src/game/UnitEvents.h
+++ b/src/game/UnitEvents.h
@@ -28,7 +28,7 @@ class HostileReference;
 //==============================================================
 //==============================================================
 
-enum UNIT_EVENT_TYPE
+enum UnitThreatEventType
 {
     // Player/Pet changed on/offline status
     UEV_THREAT_REF_ONLINE_STATUS        = 1<<0,
@@ -50,12 +50,6 @@ enum UNIT_EVENT_TYPE
 
     // A new victim (target) was set. Could be NULL
     UEV_THREAT_VICTIM_CHANGED           = 1<<6,
-
-    // Future use
-    //UEV_UNIT_KILLED                   = 1<<7,
-
-    //Future use
-    //UEV_UNIT_HEALTH_CHANGE            = 1<<8,
 };
 
 #define UEV_THREAT_REF_EVENT_MASK ( UEV_THREAT_REF_ONLINE_STATUS | UEV_THREAT_REF_THREAT_CHANGE | UEV_THREAT_REF_REMOVE_FROM_LIST | UEV_THREAT_REF_ASSECCIBLE_STATUS)
diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h
index db8a9d227..26d68dd43 100644
--- a/src/game/UpdateData.h
+++ b/src/game/UpdateData.h
@@ -24,7 +24,7 @@
 
 class WorldPacket;
 
-enum OBJECT_UPDATE_TYPE
+enum ObjectUpdateType
 {
     UPDATETYPE_VALUES               = 0,
     UPDATETYPE_MOVEMENT             = 1,
@@ -34,7 +34,7 @@ enum OBJECT_UPDATE_TYPE
     UPDATETYPE_NEAR_OBJECTS         = 5
 };
 
-enum OBJECT_UPDATE_FLAGS
+enum ObjectUpdateFlags
 {
     UPDATEFLAG_NONE                 = 0x0000,
     UPDATEFLAG_SELF                 = 0x0001,
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 8cccfa3cd..fa33fa120 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10229"
+ #define REVISION_NR "10230"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h
index 00629eb12..1e0797419 100644
--- a/src/shared/vmap/IVMapManager.h
+++ b/src/shared/vmap/IVMapManager.h
@@ -31,7 +31,7 @@ This is the minimum interface to the VMapMamager.
 namespace VMAP
 {
 
-    enum VMAP_LOAD_RESULT
+    enum VMAPLoadResult
     {
         VMAP_LOAD_RESULT_ERROR,
         VMAP_LOAD_RESULT_OK,