diff --git a/world/adventure_manager.cpp b/world/adventure_manager.cpp
index 7446696b0..21ad8a8e4 100644
--- a/world/adventure_manager.cpp
+++ b/world/adventure_manager.cpp
@@ -671,7 +671,7 @@ bool AdventureManager::LoadAdventureTemplates()
 			adventure_template
 		)
 	;
-    auto results = database.QueryDatabase(query);
+    auto results = content_db.QueryDatabase(query);
     if (!results.Success()) {
 		return false;
     }
diff --git a/zone/command.cpp b/zone/command.cpp
index dafbdb7b1..5c0504aea 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -9956,7 +9956,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
     }
 
 	if (strcasecmp(sep->arg[1], "testload") == 0 && atoi(sep->arg[2])!=0) {
-        database.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list);
+        content_db.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list);
         c->Message(Chat::White, "Group %i loaded successfully!",  atoi(sep->arg[2]));
         return;
     }
diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp
index f0e16292a..d362c8f44 100644
--- a/zone/spawn2.cpp
+++ b/zone/spawn2.cpp
@@ -166,7 +166,7 @@ bool Spawn2::Process() {
 		}
 
 		if (spawn_group == nullptr) {
-			database.LoadSpawnGroupsByID(spawngroup_id_, &zone->spawn_group_list);
+			content_db.LoadSpawnGroupsByID(spawngroup_id_, &zone->spawn_group_list);
 			spawn_group = zone->spawn_group_list.GetSpawnGroup(spawngroup_id_);
 		}
 
diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp
index 6a7817bce..f33aa7fca 100644
--- a/zone/spawngroup.cpp
+++ b/zone/spawngroup.cpp
@@ -176,7 +176,7 @@ bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id)
 void SpawnGroupList::ReloadSpawnGroups()
 {
 	ClearSpawnGroups();
-	database.LoadSpawnGroups(zone->GetShortName(), zone->GetInstanceVersion(), &zone->spawn_group_list);
+	content_db.LoadSpawnGroups(zone->GetShortName(), zone->GetInstanceVersion(), &zone->spawn_group_list);
 }
 
 void SpawnGroupList::ClearSpawnGroups()
diff --git a/zone/zone.cpp b/zone/zone.cpp
index bd00af26d..653070bba 100755
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -937,13 +937,13 @@ bool Zone::Init(bool iStaticZone) {
 	}
 
 	LogInfo("Loading spawn groups");
-	if (!database.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) {
+	if (!content_db.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) {
 		LogError("Loading spawn groups failed");
 		return false;
 	}
 
 	LogInfo("Loading spawn2 points");
-	if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion()))
+	if (!content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion()))
 	{
 		LogError("Loading spawn2 points failed");
 		return false;
@@ -1607,7 +1607,7 @@ void Zone::Repop(uint32 delay)
 
 	quest_manager.ClearAllTimers();
 
-	if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion(), delay))
+	if (!content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion(), delay))
 		LogDebug("Error in Zone::Repop: database.PopulateZoneSpawnList failed");
 
 	initgrids_timer.Start();