diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index ea11a74bc..52338b6c8 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -1984,32 +1984,32 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 	{
 		std::string hotfix_name = std::string((char*)pack->pBuffer);
 		LogInfo("Loading items");
-		if (!database.LoadItems(hotfix_name)) {
+		if (!content_db.LoadItems(hotfix_name)) {
 			LogError("Loading items failed!");
 		}
 
 		LogInfo("Loading npc faction lists");
-		if (!database.LoadNPCFactionLists(hotfix_name)) {
+		if (!content_db.LoadNPCFactionLists(hotfix_name)) {
 			LogError("Loading npcs faction lists failed!");
 		}
 
 		LogInfo("Loading loot tables");
-		if (!database.LoadLoot(hotfix_name)) {
+		if (!content_db.LoadLoot(hotfix_name)) {
 			LogError("Loading loot failed!");
 		}
 
 		LogInfo("Loading skill caps");
-		if (!database.LoadSkillCaps(std::string(hotfix_name))) {
+		if (!content_db.LoadSkillCaps(std::string(hotfix_name))) {
 			LogError("Loading skill caps failed!");
 		}
 
 		LogInfo("Loading spells");
-		if (!database.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) {
+		if (!content_db.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) {
 			LogError("Loading spells failed!");
 		}
 
 		LogInfo("Loading base data");
-		if (!database.LoadBaseData(hotfix_name)) {
+		if (!content_db.LoadBaseData(hotfix_name)) {
 			LogError("Loading base data failed!");
 		}
 		break;
diff --git a/zone/zone.cpp b/zone/zone.cpp
index becf6312c..bd00af26d 100755
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -2082,7 +2082,7 @@ void Zone::SetInstanceTimer(uint32 new_duration)
 void Zone::LoadLDoNTraps()
 {
 	const std::string query   = "SELECT id, type, spell_id, skill, locked FROM ldon_trap_templates";
-	auto              results = database.QueryDatabase(query);
+	auto              results = content_db.QueryDatabase(query);
 	if (!results.Success()) {
 		return;
 	}
@@ -2102,7 +2102,7 @@ void Zone::LoadLDoNTraps()
 void Zone::LoadLDoNTrapEntries()
 {
 	const std::string query = "SELECT id, trap_id FROM ldon_trap_entries";
-    auto results = database.QueryDatabase(query);
+    auto results = content_db.QueryDatabase(query);
     if (!results.Success()) {
 		return;
     }