diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index e73cbe37cf..b83e1d0ddb 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -119,6 +119,7 @@ set(pcsx2Sources
 	COP0.cpp
 	COP2.cpp
 	Counters.cpp
+	Dmac.cpp
 	GameDatabase.cpp
 	Dump.cpp
 	Elfheader.cpp
@@ -1284,7 +1285,6 @@ set(pcsx2LinuxHeaders
 set(pcsx2ps2Sources
 	ps2/BiosTools.cpp
 	ps2/pgif.cpp
-	ps2/LegacyDmac.cpp
 	ps2/Iop/IopHwRead.cpp
 	ps2/Iop/IopHwWrite.cpp
 	ps2/Iop/PsxBios.cpp)
diff --git a/pcsx2/ps2/LegacyDmac.cpp b/pcsx2/Dmac.cpp
similarity index 100%
rename from pcsx2/ps2/LegacyDmac.cpp
rename to pcsx2/Dmac.cpp
diff --git a/pcsx2/R5900.cpp b/pcsx2/R5900.cpp
index 10d40146ac..0064546f5b 100644
--- a/pcsx2/R5900.cpp
+++ b/pcsx2/R5900.cpp
@@ -286,7 +286,7 @@ static __fi void TESTINT( u8 n, void (*callback)() )
 		cpuSetNextEvent( cpuRegs.sCycle[n], cpuRegs.eCycle[n] );
 }
 
-// [TODO] move this function to LegacyDmac.cpp, and remove most of the DMAC-related headers from
+// [TODO] move this function to Dmac.cpp, and remove most of the DMAC-related headers from
 // being included into R5900.cpp.
 static __fi void _cpuTestInterrupts()
 {
diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index 6f0c16f8b0..892a2320f3 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -431,8 +431,8 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="ps2\Iop\PsxBios.cpp" />
-    <ClCompile Include="ps2\LegacyDmac.cpp" />
     <ClCompile Include="ps2\pgif.cpp" />
+    <ClCompile Include="Dmac.cpp" />
     <ClCompile Include="Recording\InputRecordingControls.cpp" />
     <ClCompile Include="Recording\VirtualPad\VirtualPad.cpp" />
     <ClCompile Include="Recording\VirtualPad\VirtualPadData.cpp" />
diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters
index 5783ae0d92..af0c7a8309 100644
--- a/pcsx2/pcsx2.vcxproj.filters
+++ b/pcsx2/pcsx2.vcxproj.filters
@@ -926,7 +926,7 @@
     <ClCompile Include="IPU\IPUdma.cpp">
       <Filter>System\Ps2\IPU</Filter>
     </ClCompile>
-    <ClCompile Include="ps2\LegacyDmac.cpp">
+    <ClCompile Include="Dmac.cpp">
       <Filter>System\Ps2</Filter>
     </ClCompile>
     <ClCompile Include="gui\AppUserMode.cpp">
diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj
index 945f44ea5d..c96e94e6c6 100644
--- a/pcsx2/pcsx2core.vcxproj
+++ b/pcsx2/pcsx2core.vcxproj
@@ -252,8 +252,8 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="ps2\Iop\PsxBios.cpp" />
-    <ClCompile Include="ps2\LegacyDmac.cpp" />
     <ClCompile Include="ps2\pgif.cpp" />
+    <ClCompile Include="Dmac.cpp" />
     <ClCompile Include="ShiftJisToUnicode.cpp" />
     <ClCompile Include="sif2.cpp" />
     <ClCompile Include="GS\Renderers\OpenGL\GLLoader.cpp" />
diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters
index 4222e2baee..9561d819f4 100644
--- a/pcsx2/pcsx2core.vcxproj.filters
+++ b/pcsx2/pcsx2core.vcxproj.filters
@@ -692,7 +692,7 @@
     <ClCompile Include="IPU\IPUdma.cpp">
       <Filter>System\Ps2\IPU</Filter>
     </ClCompile>
-    <ClCompile Include="ps2\LegacyDmac.cpp">
+    <ClCompile Include="Dmac.cpp">
       <Filter>System\Ps2</Filter>
     </ClCompile>
     <ClCompile Include="Gif_Unit.cpp">