diff --git a/common/database.h b/common/database.h
index 99775180d..068b0414e 100644
--- a/common/database.h
+++ b/common/database.h
@@ -275,9 +275,10 @@ public:
 	/* EQEmuLogSys */
 	void	LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
 
-private:
 	std::map<uint32,std::string>	zonename_array;
 
+private:
+
 	Mutex Mvarcache;
 	VarCache_Struct varcache;
 
diff --git a/world/main.cpp b/world/main.cpp
index 0a472551c..27ce48797 100644
--- a/world/main.cpp
+++ b/world/main.cpp
@@ -327,9 +327,11 @@ int main(int argc, char** argv) {
 	database.PurgeAllDeletedDataBuckets();
 
 	LogInfo("Loading zones");
-	// Load to both context for now... this needs to be cleaned up and is not the right way to do this
-	database.LoadZoneNames();
+
+	// Load to both context for now... this needs to be cleaned up as this has always been cludgy
 	content_db.LoadZoneNames();
+	database.zonename_array = content_db.zonename_array;
+
 	LogInfo("Clearing groups");
 	database.ClearGroup();
 	LogInfo("Clearing raids");
diff --git a/zone/main.cpp b/zone/main.cpp
index fad879ad8..7904983fb 100644
--- a/zone/main.cpp
+++ b/zone/main.cpp
@@ -313,9 +313,10 @@ int main(int argc, char** argv) {
 	}
 
 	LogInfo("Loading zone names");
-	// Load to both context for now... this needs to be cleaned up and is not the right way to do this
-	database.LoadZoneNames();
+	
+	// Load to both context for now... this needs to be cleaned up as this has always been cludgy
 	content_db.LoadZoneNames();
+	database.zonename_array = content_db.zonename_array;
 
 	LogInfo("Loading items");
 	if (!database.LoadItems(hotfix_name)) {