diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp
index fc5b78ff1..749553de1 100644
--- a/zone/bot_command.cpp
+++ b/zone/bot_command.cpp
@@ -84,7 +84,7 @@ namespace
 {
 //#define BCSTSPELLDUMP // only needed if you're adding/tailoring bot command spells and need a file dump
 
-#define m_message Chat::WhiteSmoke
+#define m_message Chat::White
 #define m_action Chat::Yellow
 #define m_note Chat::Gray
 #define m_usage Chat::Cyan
@@ -7310,7 +7310,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 		itm = itminst->GetItem();
 
 	if (itminst && itm && c->CheckLoreConflict(itm)) {
-		c->MessageString(Chat::WhiteSmoke, PICK_LORE);
+		c->MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 
@@ -7324,7 +7324,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 		if (!c->CheckLoreConflict(itma->GetItem()))
 			continue;
 
-		c->MessageString(Chat::WhiteSmoke, PICK_LORE);
+		c->MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 	
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index e0ae5562e..38e7aaff4 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -4825,7 +4825,7 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app)
 			Message(0, "This corpse can be resurrected for %i minutes and %i seconds.", min, sec);
 			}
 			else {
-			MessageString(Chat::WhiteSmoke, CORPSE_TOO_OLD);
+			MessageString(Chat::White, CORPSE_TOO_OLD);
 			}
 			*/
 		}
diff --git a/zone/effects.cpp b/zone/effects.cpp
index f6996c030..25923b35f 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -623,7 +623,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 		/*char val1[20]={0};*/	//unused
 		/*char val2[20]={0};*/	//unused
 		uint32 remain = p_timers.GetRemainingTime(DiscTimer);
-		//MessageString(Chat::WhiteSmoke, DISCIPLINE_CANUSEIN, ConvertArray((remain)/60,val1), ConvertArray(remain%60,val2));
+		//MessageString(Chat::White, DISCIPLINE_CANUSEIN, ConvertArray((remain)/60,val1), ConvertArray(remain%60,val2));
 		Message(0, "You can use this discipline in %d minutes %d seconds.", ((remain)/60), (remain%60));
 		return(false);
 	}
diff --git a/zone/forage.cpp b/zone/forage.cpp
index c3310a0d3..12d2f61a1 100644
--- a/zone/forage.cpp
+++ b/zone/forage.cpp
@@ -223,7 +223,7 @@ void Client::GoFish()
 
 	//TODO: generate a message if we're already fishing
 	/*if (!fishing_timer.Check()) {	//this isn't the right check, may need to add something to the Client class like 'bool is_fishing'
-		MessageString(Chat::WhiteSmoke, ALREADY_FISHING);	//You are already fishing!
+		MessageString(Chat::White, ALREADY_FISHING);	//You are already fishing!
 		return;
 	}*/
 
diff --git a/zone/oldcode.cpp b/zone/oldcode.cpp
index 9f20f686c..7329c73f3 100644
--- a/zone/oldcode.cpp
+++ b/zone/oldcode.cpp
@@ -1198,7 +1198,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0]
 		char val1[20]={0};
 		char val2[20]={0};
 		uint32 remain = p_timers.GetRemainingTime(pTimerDisciplineReuse);
-		MessageString(Chat::WhiteSmoke,DISCIPLINE_CANUSEIN,ConvertArray((remain)/60,val1),ConvertArray(remain%60,val2));
+		MessageString(Chat::White,DISCIPLINE_CANUSEIN,ConvertArray((remain)/60,val1),ConvertArray(remain%60,val2));
 		//Message(0,"You can use a new discipline in %i minutes %i seconds.", (disc_timer.GetRemainingTime()/1000)/60,	disc_timer.GetRemainingTime()/1000%60);
 		return;
 	}
diff --git a/zone/spells.cpp b/zone/spells.cpp
index e0ade3798..9392ab7af 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -4004,7 +4004,7 @@ void Corpse::CastRezz(uint16 spellid, Mob* Caster)
 	/*
 	if(!can_rez) {
 		if(Caster && Caster->IsClient())
-			Caster->MessageString(Chat::WhiteSmoke, CORPSE_TOO_OLD);
+			Caster->MessageString(Chat::White, CORPSE_TOO_OLD);
 		return;
 	}
 	*/