diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 7ab8a0f804..78279f86ae 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -353,11 +353,11 @@
     <Compile Include="tools\Cheats\CheatEdit.Designer.cs">
       <DependentUpon>CheatEdit.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\Cheats\CheatForm.cs">
+    <Compile Include="tools\Cheats\Cheats.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="tools\Cheats\CheatForm.Designer.cs">
-      <DependentUpon>CheatForm.cs</DependentUpon>
+    <Compile Include="tools\Cheats\Cheats.Designer.cs">
+      <DependentUpon>Cheats.cs</DependentUpon>
     </Compile>
     <Compile Include="tools\GBA\GBAGPUView.cs">
       <SubType>Form</SubType>
@@ -815,8 +815,8 @@
     <EmbeddedResource Include="tools\Cheats\CheatEdit.resx">
       <DependentUpon>CheatEdit.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\Cheats\CheatForm.resx">
-      <DependentUpon>CheatForm.cs</DependentUpon>
+    <EmbeddedResource Include="tools\Cheats\Cheats.resx">
+      <DependentUpon>Cheats.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="tools\GBA\GBAGPUView.resx">
       <DependentUpon>GBAGPUView.cs</DependentUpon>
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs
rename to BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.resx b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.resx
rename to BizHawk.Client.EmuHawk/tools/Cheats/Cheats.resx