diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 3dbf3f07b6..937b735c85 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -775,7 +775,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void OpenFWConfigRomLoadFailed(RomLoader.RomErrorArgs args)
 		{
-			using FirmwaresConfig configForm = new(
+			using FirmwareConfig configForm = new(
 				this,
 				FirmwareManager,
 				Config.FirmwareUserSpecifications,
@@ -787,7 +787,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void FirmwaresMenuItem_Click(object sender, EventArgs e)
 		{
-			using var configForm = new FirmwaresConfig(this, FirmwareManager, Config.FirmwareUserSpecifications, Config.PathEntries);
+			using var configForm = new FirmwareConfig(this, FirmwareManager, Config.FirmwareUserSpecifications, Config.PathEntries);
 			this.ShowDialogWithTempMute(configForm);
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs
index 1b38a79582..6e76d791ab 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs
@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.EmuHawk
 {
-    partial class FirmwaresConfig
+    partial class FirmwareConfig
     {
         /// <summary>
         /// Required designer variable.
@@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk
         private void InitializeComponent()
         {
 			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FirmwaresConfig));
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FirmwareConfig));
 			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
 			this.lvFirmware = new System.Windows.Forms.ListView();
 			this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -344,13 +344,13 @@ namespace BizHawk.Client.EmuHawk
 			this.label2.Name = "label2";
 			this.label2.Text = "Firmware such as BIOS files are copyrighted material and not provided by BizHawk";
 			// 
-			// FirmwaresConfig
+			// FirmwareConfig
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(830, 478);
 			this.Controls.Add(this.tableLayoutPanel1);
-			this.Name = "FirmwaresConfig";
+			this.Name = "FirmwareConfig";
 			this.ShowIcon = false;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Firmware";
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
index 23df4c38ca..5d93ad71a6 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
@@ -25,7 +25,7 @@ using BizHawk.Emulation.Common;
 // IDEA: prepop set customization to dir of current custom
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class FirmwaresConfig : Form, IDialogParent
+	public partial class FirmwareConfig : Form, IDialogParent
 	{
 		private const string STATUS_DESC_UNUSED = "";
 
@@ -121,7 +121,7 @@ namespace BizHawk.Client.EmuHawk
 		private string _currSelectorDir;
 		private readonly ListViewSorter _listViewSorter;
 
-		public FirmwaresConfig(
+		public FirmwareConfig(
 			IDialogController dialogController,
 			FirmwareManager firmwareManager,
 			IDictionary<string, string> firmwareUserSpecifications,
@@ -180,7 +180,7 @@ namespace BizHawk.Client.EmuHawk
 		private void FirmwareConfig_Load(object sender, EventArgs e)
 		{
 			string GetSystemGroupName(string sysID)
-				=> SystemGroupNames.TryGetValue(sysID, out var name) ? name : $"FIX ME ({nameof(FirmwaresConfig)}.{nameof(SystemGroupNames)})";
+				=> SystemGroupNames.TryGetValue(sysID, out var name) ? name : $"FIX ME ({nameof(FirmwareConfig)}.{nameof(SystemGroupNames)})";
 			ListViewGroup AddGroup(string sysID)
 			{
 				lvFirmware.Groups.Add(
@@ -529,7 +529,7 @@ namespace BizHawk.Client.EmuHawk
 			// get all options for this firmware (in order)
 			var options = FirmwareDatabase.FirmwareOptions.Where(fo => fo.ID == fr.ID);
 
-			var fciDialog = new FirmwaresConfigInfo
+			var fciDialog = new FirmwareConfigInfo
 			{
 				lblFirmware =
 				{
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs
index fdb3fd8b63..3c1f9e269d 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs
@@ -1,6 +1,6 @@
 namespace BizHawk.Client.EmuHawk
 {
-	partial class FirmwaresConfigInfo
+	partial class FirmwareConfigInfo
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -177,7 +177,7 @@
 			this.tsmiOptionsCopy.Text = "&Copy";
 			this.tsmiOptionsCopy.Click += new System.EventHandler(this.TsmiOptionsCopy_Click);
 			// 
-			// FirmwaresConfigInfo
+			// FirmwareConfigInfo
 			// 
 			this.AcceptButton = this.btnClose;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -185,7 +185,7 @@
 			this.CancelButton = this.btnClose;
 			this.ClientSize = new System.Drawing.Size(728, 469);
 			this.Controls.Add(this.tableLayoutPanel1);
-			this.Name = "FirmwaresConfigInfo";
+			this.Name = "FirmwareConfigInfo";
 			this.ShowIcon = false;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Firmware Info";
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs
index a9e834a1f9..2e116378c8 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs
@@ -6,14 +6,14 @@ using System.Windows.Forms;
 // todo - turn top info into textboxes i guess, labels suck
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class FirmwaresConfigInfo : Form
+	public partial class FirmwareConfigInfo : Form
 	{
-		public FirmwaresConfigInfo()
+		public FirmwareConfigInfo()
 		{
 			InitializeComponent();
 
 			// prep imagelist for listview
-			foreach (var kvp in FirmwaresConfig.StatusIcons.OrderBy(static kvp => kvp.Key)) imageList1.Images.Add(kvp.Value);
+			foreach (var kvp in FirmwareConfig.StatusIcons.OrderBy(static kvp => kvp.Key)) imageList1.Images.Add(kvp.Value);
 		}
 
 		private void LvOptions_KeyDown(object sender, KeyEventArgs e)