diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 31997b07f6..bb9f179e96 100755
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -120,12 +120,12 @@
 		<Compile Update="config/FileExtensionPreferencesPicker.cs" SubType="UserControl" />
 		<Compile Update="config/FileExtensionPreferencesPicker.Designer.cs" DependentUpon="FileExtensionPreferencesPicker.cs" />
 		<EmbeddedResource Update="config/FileExtensionPreferencesPicker.resx" DependentUpon="FileExtensionPreferencesPicker.cs" />
-		<Compile Update="config/FirmwaresConfig.cs" SubType="Form" />
-		<Compile Update="config/FirmwaresConfig.Designer.cs" DependentUpon="FirmwaresConfig.cs" />
-		<EmbeddedResource Update="config/FirmwaresConfig.resx" DependentUpon="FirmwaresConfig.cs" />
-		<Compile Update="config/FirmwaresConfigInfo.cs" SubType="Form" />
-		<Compile Update="config/FirmwaresConfigInfo.Designer.cs" DependentUpon="FirmwaresConfigInfo.cs" />
-		<EmbeddedResource Update="config/FirmwaresConfigInfo.resx" DependentUpon="FirmwaresConfigInfo.cs" />
+		<Compile Update="config/FirmwareConfig.cs" SubType="Form" />
+		<Compile Update="config/FirmwareConfig.Designer.cs" DependentUpon="FirmwareConfig.cs" />
+		<EmbeddedResource Update="config/FirmwareConfig.resx" DependentUpon="FirmwareConfig.cs" />
+		<Compile Update="config/FirmwareConfigInfo.cs" SubType="Form" />
+		<Compile Update="config/FirmwareConfigInfo.Designer.cs" DependentUpon="FirmwareConfigInfo.cs" />
+		<EmbeddedResource Update="config/FirmwareConfigInfo.resx" DependentUpon="FirmwareConfigInfo.cs" />
 		<Compile Update="config/GB/BmpView.cs" SubType="Component" />
 		<Compile Update="config/GB/CGBColorChooserForm.cs" SubType="Form" />
 		<Compile Update="config/GB/CGBColorChooserForm.Designer.cs" DependentUpon="CGBColorChooserForm.cs" />
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.Designer.cs
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs
rename to src/BizHawk.Client.EmuHawk/config/FirmwareConfig.Designer.cs
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
rename to src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.resx b/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.resx
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.resx
rename to src/BizHawk.Client.EmuHawk/config/FirmwareConfig.resx
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FirmwareConfigInfo.Designer.cs
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs
rename to src/BizHawk.Client.EmuHawk/config/FirmwareConfigInfo.Designer.cs
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs b/src/BizHawk.Client.EmuHawk/config/FirmwareConfigInfo.cs
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs
rename to src/BizHawk.Client.EmuHawk/config/FirmwareConfigInfo.cs
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.resx b/src/BizHawk.Client.EmuHawk/config/FirmwareConfigInfo.resx
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.resx
rename to src/BizHawk.Client.EmuHawk/config/FirmwareConfigInfo.resx