diff --git a/import/XbSymbolDatabase b/import/XbSymbolDatabase
index 8b000c0ca..0298a65f2 160000
--- a/import/XbSymbolDatabase
+++ b/import/XbSymbolDatabase
@@ -1 +1 @@
-Subproject commit 8b000c0ca7f20d88dddd95e80ad257ba2a0cffaa
+Subproject commit 0298a65f228b0c76915bb115d0134675777a0e3d
diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
index ede4bcc3d..8cfeec77d 100644
--- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
+++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
@@ -7989,7 +7989,7 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawVertices)
 		return;
 	}
 
-	// TODO : Call unpatched D3DDevice_SetStateVB(0);
+	// TODO : Call unpatched CDevice_SetStateVB(0);
 
 	CxbxUpdateNativeD3DResources();
 
@@ -8108,7 +8108,7 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawVerticesUP)
 		return;
 	}
 
-	// TODO : Call unpatched D3DDevice_SetStateUP();
+	// TODO : Call unpatched CDevice_SetStateUP();
 
 	CxbxUpdateNativeD3DResources();
 
@@ -8173,7 +8173,7 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVertices)
 		return;
 	}
 
-	// TODO : Call unpatched D3DDevice_SetStateVB(g_Xbox_BaseVertexIndex);
+	// TODO : Call unpatched CDevice_SetStateVB(g_Xbox_BaseVertexIndex);
 
 	CxbxUpdateNativeD3DResources();
 
@@ -8216,7 +8216,7 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVerticesUP)
 		return;
 	}
 
-	// TODO : Call unpatched D3DDevice_SetStateUP();
+	// TODO : Call unpatched CDevice_SetStateUP();
 
 	CxbxUpdateNativeD3DResources();
 
@@ -9145,9 +9145,9 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetProjectionViewportMatrix)
 #pragma warning(default:4244)
 
 // ******************************************************************
-// * patch: D3DDevice_SetStateVB (D3D::CDevice::SetStateVB)
+// * patch: CDevice_SetStateVB (D3D::CDevice::SetStateVB)
 // ******************************************************************
-xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStateVB)(ulong_xt Unknown1 )
+xbox::void_xt WINAPI xbox::EMUPATCH(CDevice_SetStateVB)(ulong_xt Unknown1 )
 {
 	LOG_FUNC_ONE_ARG(Unknown1);
 
@@ -9158,9 +9158,9 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStateVB)(ulong_xt Unknown1 )
 }
 
 // ******************************************************************
-// * patch: D3DDevice_SetStateUP (D3D::CDevice::SetStateUP)
+// * patch: CDevice_SetStateUP (D3D::CDevice::SetStateUP)
 // ******************************************************************
-xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStateUP)()
+xbox::void_xt WINAPI xbox::EMUPATCH(CDevice_SetStateUP)()
 {
 	LOG_FUNC();
 
diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.h b/src/core/hle/D3D8/Direct3D9/Direct3D9.h
index f3ae9c596..d8014607f 100644
--- a/src/core/hle/D3D8/Direct3D9/Direct3D9.h
+++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.h
@@ -1912,14 +1912,14 @@ xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetTexture)
 );
 
 // ******************************************************************
-// * patch: D3DDevice_SetStateVB (D3D::CDevice::SetStateVB)
+// * patch: CDevice_SetStateVB (D3D::CDevice::SetStateVB)
 // ******************************************************************
-xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStateVB)( xbox::ulong_xt Unknown1 );
+xbox::void_xt WINAPI EMUPATCH(CDevice_SetStateVB)( xbox::ulong_xt Unknown1 );
 
 // ******************************************************************
-// * patch: D3DDevice_SetStateUP (D3D::CDevice::SetStateUP)
+// * patch: CDevice_SetStateUP (D3D::CDevice::SetStateUP)
 // ******************************************************************
-xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStateUP)();
+xbox::void_xt WINAPI EMUPATCH(CDevice_SetStateUP)();
 
 // ******************************************************************
 // * patch: D3DDevice_SetStipple
diff --git a/src/core/hle/Patches.cpp b/src/core/hle/Patches.cpp
index ad76ad3d4..1325a56e7 100644
--- a/src/core/hle/Patches.cpp
+++ b/src/core/hle/Patches.cpp
@@ -56,6 +56,8 @@ const uint32_t PATCH_IS_FIBER = 1 << 4;
 // This allows for the eventual importing of Dxbx symbol files and even IDA signatures too!
 std::map<const std::string, const xbox_patch_t> g_PatchTable = {
 	// Direct3D
+	PATCH_ENTRY("CDevice_SetStateUP", xbox::EMUPATCH(CDevice_SetStateUP), PATCH_HLE_D3D),
+	PATCH_ENTRY("CDevice_SetStateVB", xbox::EMUPATCH(CDevice_SetStateVB), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_Begin", xbox::EMUPATCH(D3DDevice_Begin), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_BeginPush", xbox::EMUPATCH(D3DDevice_BeginPush), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_BeginPush2", xbox::EMUPATCH(D3DDevice_BeginPush2), PATCH_HLE_D3D),
@@ -144,8 +146,6 @@ std::map<const std::string, const xbox_patch_t> g_PatchTable = {
 	PATCH_ENTRY("D3DDevice_SetShaderConstantMode", xbox::EMUPATCH(D3DDevice_SetShaderConstantMode), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_SetShaderConstantMode_0", xbox::EMUPATCH(D3DDevice_SetShaderConstantMode_0), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_SetSoftDisplayFilter", xbox::EMUPATCH(D3DDevice_SetSoftDisplayFilter), PATCH_HLE_D3D),
-	PATCH_ENTRY("D3DDevice_SetStateUP", xbox::EMUPATCH(D3DDevice_SetStateUP), PATCH_HLE_D3D),
-	PATCH_ENTRY("D3DDevice_SetStateVB", xbox::EMUPATCH(D3DDevice_SetStateVB), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_SetStipple", xbox::EMUPATCH(D3DDevice_SetStipple), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_SetStreamSource", xbox::EMUPATCH(D3DDevice_SetStreamSource), PATCH_HLE_D3D),
 	PATCH_ENTRY("D3DDevice_SetStreamSource_0__LTCG_eax_StreamNumber_edi_pStreamData_ebx_Stride", xbox::EMUPATCH(D3DDevice_SetStreamSource_0__LTCG_eax_StreamNumber_edi_pStreamData_ebx_Stride), PATCH_HLE_D3D),