diff --git a/src/common/Settings.cpp b/src/common/Settings.cpp
index 6b082b6d6..af16fdda7 100644
--- a/src/common/Settings.cpp
+++ b/src/common/Settings.cpp
@@ -809,7 +809,7 @@ void Settings::SyncToEmulator()
 	g_EmuShared->SetHackSettings(&m_hacks);
 
 	// register data location setting
-	g_EmuShared->SetStorageLocation(GetDataLocation().c_str());
+	g_EmuShared->SetDataLocation(GetDataLocation().c_str());
 
 	// reset title mount path
 	g_EmuShared->SetTitleMountPath("");
diff --git a/src/common/win32/EmuShared.h b/src/common/win32/EmuShared.h
index 1f685437c..9fb36fae6 100644
--- a/src/common/win32/EmuShared.h
+++ b/src/common/win32/EmuShared.h
@@ -246,10 +246,10 @@ class EmuShared : public Mutex
 		void SetLogPopupTestCase(const bool value) { Lock(); m_core.bLogPopupTestCase = value; Unlock(); }
 
 		// ******************************************************************
-		// * File storage location
+		// * Data location path
 		// ******************************************************************
-		void GetStorageLocation(char *path) { Lock(); strncpy(path, m_core.szStorageLocation, xbox::max_path); Unlock(); }
-		void SetStorageLocation(const char *path) { Lock(); strncpy(m_core.szStorageLocation, path, xbox::max_path); Unlock(); }
+		void GetDataLocation(char *path) { Lock(); strncpy(path, m_core.szStorageLocation, xbox::max_path); Unlock(); }
+		void SetDataLocation(const char *path) { Lock(); strncpy(m_core.szStorageLocation, path, xbox::max_path); Unlock(); }
 
 		// ******************************************************************
 		// * ClipCursor flag Accessors
diff --git a/src/core/common/imgui/ui.cpp b/src/core/common/imgui/ui.cpp
index d4a002140..8a10be2bd 100644
--- a/src/core/common/imgui/ui.cpp
+++ b/src/core/common/imgui/ui.cpp
@@ -27,7 +27,7 @@ bool ImGuiUI::Initialize()
 	ImGuiIO& io = ImGui::GetIO();
 #if 0 // TODO: Currently most voted for memory, so this block of code is disabled. And may will add an option between file vs memory.
 	// May be best ideal to do manual update call than ImGui's internal auto update.
-	g_EmuShared->GetStorageLocation(m_file_path);
+	g_EmuShared->GetDataLocation(m_file_path);
 	if (m_file_path[0] == '\0') {
 		return false;
 	}
diff --git a/src/core/kernel/init/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp
index 2b3290dd7..bdc4f3ec2 100644
--- a/src/core/kernel/init/CxbxKrnl.cpp
+++ b/src/core/kernel/init/CxbxKrnl.cpp
@@ -1420,7 +1420,7 @@ __declspec(noreturn) void CxbxKrnlInit
 	// Initialize devices :
 	{
 		char cxbxr_data_path[sizeof(szFilePath_Xbe)];
-		g_EmuShared->GetStorageLocation(cxbxr_data_path);
+		g_EmuShared->GetDataLocation(cxbxr_data_path);
 
 		g_DiskBasePath = std::string(cxbxr_data_path) + "\\EmuDisk";
 		g_MuBasePath = std::string(cxbxr_data_path) + "\\EmuMu";
@@ -1741,7 +1741,7 @@ void CxbxInitFilePaths()
 		std::strncpy(szFolder_CxbxReloadedData, dataLoc.c_str(), dataLoc.length() + 1);
 	}
 	else {
-		g_EmuShared->GetStorageLocation(szFolder_CxbxReloadedData);
+		g_EmuShared->GetDataLocation(szFolder_CxbxReloadedData);
 	}
 
 	// Make sure our data folder exists :
diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp
index b1146b69f..5d6a9040d 100644
--- a/src/gui/WndMain.cpp
+++ b/src/gui/WndMain.cpp
@@ -215,7 +215,7 @@ WndMain::WndMain(HINSTANCE x_hInstance) :
 		g_Settings->Verify();
 
 		// NOTE: This is a requirement for pre-verification from GUI. Used in CxbxInitFilePaths function.
-		g_EmuShared->SetStorageLocation(g_Settings->GetDataLocation().c_str());
+		g_EmuShared->SetDataLocation(g_Settings->GetDataLocation().c_str());
 
 		unsigned int i = 0;
 		do {