diff --git a/FSR3UnityPlugin.vcxproj b/FSR3UnityPlugin.vcxproj
index 466d08b..bead0de 100644
--- a/FSR3UnityPlugin.vcxproj
+++ b/FSR3UnityPlugin.vcxproj
@@ -162,8 +162,8 @@
     <ClInclude Include="src/FSR3Upscaler_DX12.h" />
     <ClInclude Include="src/FSR3Upscaler_FFXBase.h" />
     <ClInclude Include="src/FSR3Upscaler_Vulkan.h" />
-    <ClInclude Include="src/Upscaler.h" />
-    <ClInclude Include="src/UpscalerGraphicsDevice.h" />
+    <ClInclude Include="src\IUpscaler.h" />
+    <ClInclude Include="src\UpscalerBase.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/FSR3UnityPlugin.vcxproj.filters b/FSR3UnityPlugin.vcxproj.filters
index fadcbc3..086a1cf 100644
--- a/FSR3UnityPlugin.vcxproj.filters
+++ b/FSR3UnityPlugin.vcxproj.filters
@@ -32,7 +32,7 @@
     <ClInclude Include="src/FSR3UnityTypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src/UpscalerGraphicsDevice.h">
+    <ClInclude Include="src\UpscalerBase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src/FSR3Upscaler_DX12.h">
@@ -47,7 +47,7 @@
     <ClInclude Include="src/FSR2Upscaler_DX11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src/Upscaler.h">
+    <ClInclude Include="src\IUpscaler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/src/FSR2Upscaler_DX11.h b/src/FSR2Upscaler_DX11.h
index 62b9ba8..1660186 100644
--- a/src/FSR2Upscaler_DX11.h
+++ b/src/FSR2Upscaler_DX11.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "UpscalerGraphicsDevice.h"
+#include "UpscalerBase.h"
 
 #include "ffx-fsr2-api/ffx_fsr2.h"
 
@@ -21,7 +21,7 @@ struct FSR2Feature
     FSR3TextureTable textureTable;
 };
 
-class FSR2Upscaler_DX11 : public UpscalerGraphicsDevice<FSR2Feature>
+class FSR2Upscaler_DX11 : public UpscalerBase<FSR2Feature>
 {
 public:
     FSR2Upscaler_DX11(IUnityGraphicsD3D11* graphicsDevice) :
diff --git a/src/FSR3UnityPlugin.cpp b/src/FSR3UnityPlugin.cpp
index 6abfaed..de5124b 100644
--- a/src/FSR3UnityPlugin.cpp
+++ b/src/FSR3UnityPlugin.cpp
@@ -1,4 +1,4 @@
-#include "Upscaler.h"
+#include "IUpscaler.h"
 
 #include "UnityPluginAPI/IUnityInterface.h"
 #include "UnityPluginAPI/IUnityLog.h"
@@ -20,7 +20,7 @@ static void UNITY_INTERFACE_API OnGraphicsDeviceEvent(UnityGfxDeviceEventType ev
 static void UNITY_INTERFACE_API OnRenderEventAndData(int eventID, void* data);
 static void UNITY_INTERFACE_API OnSetTextureEvent(int eventID, void* data);
 
-static Upscaler* s_Upscaler = nullptr;
+static IUpscaler* s_Upscaler = nullptr;
 
 // Unity plugin load event
 extern "C" void UNITY_INTERFACE_EXPORT UNITY_INTERFACE_API UnityPluginLoad(IUnityInterfaces* unityInterfaces)
diff --git a/src/FSR3Upscaler_FFXBase.h b/src/FSR3Upscaler_FFXBase.h
index 9ec177f..4e02c5b 100644
--- a/src/FSR3Upscaler_FFXBase.h
+++ b/src/FSR3Upscaler_FFXBase.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "UpscalerGraphicsDevice.h"
+#include "UpscalerBase.h"
 
 #include <sstream>
 
@@ -21,7 +21,7 @@ struct FSR3Feature_FFX
     FSR3TextureTable textureTable;
 };
 
-class FSR3Upscaler_FFXBase : public UpscalerGraphicsDevice<FSR3Feature_FFX>
+class FSR3Upscaler_FFXBase : public UpscalerBase<FSR3Feature_FFX>
 {
 public:
     FSR3Upscaler_FFXBase(IUnityLog* log)
diff --git a/src/Upscaler.h b/src/IUpscaler.h
similarity index 97%
rename from src/Upscaler.h
rename to src/IUpscaler.h
index bd3bf84..c00c10e 100644
--- a/src/Upscaler.h
+++ b/src/IUpscaler.h
@@ -4,7 +4,7 @@
 #include "UnityPluginAPI/IUnityInterface.h"
 #include "FSR3UnityTypes.h"
 
-class Upscaler
+class IUpscaler
 {
 public:
     virtual bool Init() = 0;
diff --git a/src/UpscalerGraphicsDevice.h b/src/UpscalerBase.h
similarity index 98%
rename from src/UpscalerGraphicsDevice.h
rename to src/UpscalerBase.h
index a32ea99..9c7e48d 100644
--- a/src/UpscalerGraphicsDevice.h
+++ b/src/UpscalerBase.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "Upscaler.h"
+#include "IUpscaler.h"
 
 #include <vector>
 #include <queue>
 #include <mutex>
 
-template<typename TFeature> class UpscalerGraphicsDevice: public Upscaler
+template<typename TFeature> class UpscalerBase: public IUpscaler
 {
 public:
     void Shutdown() override