diff --git a/DDrawCompat/CompatDirectDrawPalette.cpp b/DDrawCompat/CompatDirectDrawPalette.cpp
index a0eccb9..833b571 100644
--- a/DDrawCompat/CompatDirectDrawPalette.cpp
+++ b/DDrawCompat/CompatDirectDrawPalette.cpp
@@ -19,11 +19,11 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawPalette::SetEntries(
 	DWORD dwCount,
 	LPPALETTEENTRY lpEntries)
 {
-	if (This == CompatPrimarySurface::palette)
+	if (This == CompatPrimarySurface::g_palette)
 	{
 		waitForNextUpdate();
 		if (lpEntries && dwStartingEntry + dwCount <= 256 &&
-			0 == std::memcmp(&CompatPrimarySurface::paletteEntries[dwStartingEntry],
+			0 == std::memcmp(&CompatPrimarySurface::g_paletteEntries[dwStartingEntry],
 				lpEntries, dwCount * sizeof(PALETTEENTRY)))
 		{
 			return DD_OK;
@@ -31,9 +31,9 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawPalette::SetEntries(
 	}
 
 	HRESULT result = s_origVtable.SetEntries(This, dwFlags, dwStartingEntry, dwCount, lpEntries);
-	if (This == CompatPrimarySurface::palette && SUCCEEDED(result))
+	if (This == CompatPrimarySurface::g_palette && SUCCEEDED(result))
 	{
-		std::memcpy(&CompatPrimarySurface::paletteEntries[dwStartingEntry], lpEntries,
+		std::memcpy(&CompatPrimarySurface::g_paletteEntries[dwStartingEntry], lpEntries,
 			dwCount * sizeof(PALETTEENTRY));
 		RealPrimarySurface::updatePalette(dwStartingEntry, dwCount);
 	}
diff --git a/DDrawCompat/CompatDirectDrawSurface.cpp b/DDrawCompat/CompatDirectDrawSurface.cpp
index a613247..262de61 100644
--- a/DDrawCompat/CompatDirectDrawSurface.cpp
+++ b/DDrawCompat/CompatDirectDrawSurface.cpp
@@ -497,7 +497,7 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawSurface<TSurface>::SetPalette(
 		{
 			CompatDirectDrawPalette::waitForNextUpdate();
 		}
-		if (lpDDPalette == CompatPrimarySurface::palette)
+		if (lpDDPalette == CompatPrimarySurface::g_palette)
 		{
 			return DD_OK;
 		}
@@ -506,7 +506,7 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawSurface<TSurface>::SetPalette(
 	HRESULT result = s_origVtable.SetPalette(This, lpDDPalette);
 	if (isPrimary && SUCCEEDED(result))
 	{
-		CompatPrimarySurface::palette = lpDDPalette;
+		CompatPrimarySurface::g_palette = lpDDPalette;
 		RealPrimarySurface::setPalette();
 	}
 	return result;
diff --git a/DDrawCompat/CompatGdi.cpp b/DDrawCompat/CompatGdi.cpp
index a3e78db..27d5318 100644
--- a/DDrawCompat/CompatGdi.cpp
+++ b/DDrawCompat/CompatGdi.cpp
@@ -239,7 +239,7 @@ namespace CompatGdi
 
 	void updatePalette(DWORD startingEntry, DWORD count)
 	{
-		if (isEmulationEnabled() && CompatPrimarySurface::palette)
+		if (isEmulationEnabled() && CompatPrimarySurface::g_palette)
 		{
 			CompatGdiDcCache::updatePalette(startingEntry, count);
 		}
diff --git a/DDrawCompat/CompatGdiDcCache.cpp b/DDrawCompat/CompatGdiDcCache.cpp
index e94164d..066b415 100644
--- a/DDrawCompat/CompatGdiDcCache.cpp
+++ b/DDrawCompat/CompatGdiDcCache.cpp
@@ -200,15 +200,15 @@ namespace CompatGdiDcCache
 	{
 		PALETTEENTRY entries[256] = {};
 		std::memcpy(&entries[startingEntry],
-			&CompatPrimarySurface::paletteEntries[startingEntry],
+			&CompatPrimarySurface::g_paletteEntries[startingEntry],
 			count * sizeof(PALETTEENTRY));
 
 		for (DWORD i = startingEntry; i < startingEntry + count; ++i)
 		{
 			if (entries[i].peFlags & PC_RESERVED)
 			{
-				entries[i] = CompatPrimarySurface::paletteEntries[0];
-				entries[i].peFlags = CompatPrimarySurface::paletteEntries[i].peFlags;
+				entries[i] = CompatPrimarySurface::g_paletteEntries[0];
+				entries[i].peFlags = CompatPrimarySurface::g_paletteEntries[i].peFlags;
 			}
 		}
 
diff --git a/DDrawCompat/CompatPaletteConverter.cpp b/DDrawCompat/CompatPaletteConverter.cpp
index 8f77524..0bc19bf 100644
--- a/DDrawCompat/CompatPaletteConverter.cpp
+++ b/DDrawCompat/CompatPaletteConverter.cpp
@@ -149,10 +149,10 @@ namespace CompatPaletteConverter
 
 	void updatePalette(DWORD startingEntry, DWORD count)
 	{
-		if (g_dc && CompatPrimarySurface::palette)
+		if (g_dc && CompatPrimarySurface::g_palette)
 		{
 			RGBQUAD entries[256] = {};
-			std::memcpy(entries, &CompatPrimarySurface::paletteEntries[startingEntry],
+			std::memcpy(entries, &CompatPrimarySurface::g_paletteEntries[startingEntry],
 				count * sizeof(PALETTEENTRY));
 			convertPaletteEntriesToRgbQuad(entries, count);
 			SetDIBColorTable(g_dc, startingEntry, count, entries);
diff --git a/DDrawCompat/CompatPrimarySurface.cpp b/DDrawCompat/CompatPrimarySurface.cpp
index 1d3b535..be6a0f6 100644
--- a/DDrawCompat/CompatPrimarySurface.cpp
+++ b/DDrawCompat/CompatPrimarySurface.cpp
@@ -22,8 +22,8 @@ namespace
 
 		g_primarySurfacePtrs.clear();
 		g_primarySurface = nullptr;
-		CompatPrimarySurface::palette = nullptr;
-		ZeroMemory(&CompatPrimarySurface::paletteEntries, sizeof(CompatPrimarySurface::paletteEntries));
+		CompatPrimarySurface::g_palette = nullptr;
+		ZeroMemory(&CompatPrimarySurface::g_paletteEntries, sizeof(CompatPrimarySurface::g_paletteEntries));
 		ZeroMemory(&g_primarySurfaceDesc, sizeof(g_primarySurfaceDesc));
 
 		RealPrimarySurface::release();
@@ -76,6 +76,6 @@ namespace CompatPrimarySurface
 			releaseNotifierPtr, sizeof(releaseNotifierPtr), DDSPD_IUNKNOWNPOINTER);
 	}
 
-	CompatWeakPtr<IDirectDrawPalette> palette;
-	PALETTEENTRY paletteEntries[256] = {};
+	CompatWeakPtr<IDirectDrawPalette> g_palette;
+	PALETTEENTRY g_paletteEntries[256] = {};
 }
diff --git a/DDrawCompat/CompatPrimarySurface.h b/DDrawCompat/CompatPrimarySurface.h
index fc47b2f..fb9352b 100644
--- a/DDrawCompat/CompatPrimarySurface.h
+++ b/DDrawCompat/CompatPrimarySurface.h
@@ -16,6 +16,6 @@ namespace CompatPrimarySurface
 	bool isPrimary(void* surface);
 	void setPrimary(CompatRef<IDirectDrawSurface7> surface);
 
-	extern CompatWeakPtr<IDirectDrawPalette> palette;
-	extern PALETTEENTRY paletteEntries[256];
+	extern CompatWeakPtr<IDirectDrawPalette> g_palette;
+	extern PALETTEENTRY g_paletteEntries[256];
 }
diff --git a/DDrawCompat/RealPrimarySurface.cpp b/DDrawCompat/RealPrimarySurface.cpp
index 9a2b7a6..1318541 100644
--- a/DDrawCompat/RealPrimarySurface.cpp
+++ b/DDrawCompat/RealPrimarySurface.cpp
@@ -350,7 +350,7 @@ void RealPrimarySurface::setPalette()
 {
 	if (g_surfaceDesc.ddpfPixelFormat.dwRGBBitCount <= 8)
 	{
-		g_frontBuffer->SetPalette(g_frontBuffer, CompatPrimarySurface::palette);
+		g_frontBuffer->SetPalette(g_frontBuffer, CompatPrimarySurface::g_palette);
 	}
 
 	updatePalette(0, 256);
@@ -376,7 +376,7 @@ void RealPrimarySurface::updatePalette(DWORD startingEntry, DWORD count)
 {
 	CompatPaletteConverter::updatePalette(startingEntry, count);
 	CompatGdi::updatePalette(startingEntry, count);
-	if (CompatPrimarySurface::palette)
+	if (CompatPrimarySurface::g_palette)
 	{
 		invalidate(nullptr);
 		update();