diff --git a/common/deity.cpp b/common/deity.cpp
index 228a7a81e..2e76cd567 100644
--- a/common/deity.cpp
+++ b/common/deity.cpp
@@ -20,9 +20,9 @@
 #include "deity.h"
 
 
-EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityToDeityBit(DeityType deity)
+EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type)
 {
-	switch (deity) {
+	switch (deity_type) {
 	case DeityBertoxxulous:
 		return bit_DeityBertoxxulous;
 	case DeityBrellSirilis:
@@ -63,9 +63,9 @@ EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityToDeityBit(DeityType deity)
 	};
 }
 
-EQEmu::deity::DeityType EQEmu::deity::ConvertDeityBitToDeity(DeityTypeBit deity_bit)
+EQEmu::deity::DeityType EQEmu::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
 {
-	switch (deity_bit) {
+	switch (deity_type_bit) {
 	case bit_DeityAgnostic:
 		return DeityAgnostic;
 	case bit_DeityBertoxxulous:
@@ -105,9 +105,9 @@ EQEmu::deity::DeityType EQEmu::deity::ConvertDeityBitToDeity(DeityTypeBit deity_
 	};
 }
 
-const char* EQEmu::deity::DeityName(DeityType deity)
+const char* EQEmu::deity::DeityName(DeityType deity_type)
 {
-	switch (deity) {
+	switch (deity_type) {
 	case DeityBertoxxulous:
 		return "Bertoxxulous";
 	case DeityBrellSirilis:
diff --git a/common/deity.h b/common/deity.h
index fe8dce938..b7a4a14b7 100644
--- a/common/deity.h
+++ b/common/deity.h
@@ -67,9 +67,9 @@ namespace EQEmu
 			bit_DeityVeeshan = 0x00010000
 		};
 
-		extern DeityTypeBit ConvertDeityToDeityBit(DeityType deity);
-		extern DeityType ConvertDeityBitToDeity(DeityTypeBit deity_bit);
-		extern const char* DeityName(DeityType deity);
+		extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);
+		extern DeityType ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit);
+		extern const char* DeityName(DeityType deity_type);
 	}
 }
 
diff --git a/zone/mob.h b/zone/mob.h
index c276f212b..a3b759864 100644
--- a/zone/mob.h
+++ b/zone/mob.h
@@ -364,7 +364,7 @@ public:
 	virtual inline uint16 GetBaseRace() const { return base_race; }
 	virtual inline uint8 GetBaseGender() const { return base_gender; }
 	virtual inline uint16 GetDeity() const { return deity; }
-	virtual EQEmu::deity::DeityTypeBit GetDeityBit() { return EQEmu::deity::ConvertDeityToDeityBit((EQEmu::deity::DeityType)deity); }
+	virtual EQEmu::deity::DeityTypeBit GetDeityBit() { return EQEmu::deity::ConvertDeityTypeToDeityTypeBit((EQEmu::deity::DeityType)deity); }
 	inline uint16 GetRace() const { return race; }
 	inline uint8 GetGender() const { return gender; }
 	inline uint8 GetTexture() const { return texture; }