diff --git a/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
index aa290b09a5..1f74056fea 100644
--- a/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
+++ b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
@@ -66,7 +66,7 @@ namespace BizHawk.Client.Common
 		}
 
 		/// <remarks>
-		/// Sometimes this is called from a loop in <c>FirmwaresConfig.DoScan</c>.
+		/// Sometimes this is called from a loop in <c>FirmwareConfig.DoScan</c>.
 		/// In that case, we don't want to call <see cref="DoScanAndResolve"/> repeatedly, so we use <paramref name="forbidScan"/> to skip it.
 		/// </remarks>
 		public ResolutionInfo? Resolve(PathEntryCollection pathEntries, IDictionary<string, string> userSpecifications, FirmwareRecord record, bool forbidScan = false)
@@ -144,7 +144,7 @@ namespace BizHawk.Client.Common
 		{
 			var reader = new RealFirmwareReader();
 
-			// build a list of files under the global firmwares path, and build a hash for each of them (as ResolutionInfo) while we're at it
+			// build a list of files under the global firmware path, and build a hash for each of them (as ResolutionInfo) while we're at it
 			Queue<DirectoryInfo> todo = [ new(pathEntries.FirmwareAbsolutePath()) ];
 			while (todo.Count != 0)
 			{
@@ -207,7 +207,7 @@ namespace BizHawk.Client.Common
 				ri.Size = fi.Length;
 				ri.Hash = rff.Hash;
 
-				// check whether it was a known file anyway, and go ahead and bind to the known file, as a perk (the firmwares config doesn't really use this information right now)
+				// check whether it was a known file anyway, and go ahead and bind to the known file, as a perk (the firmware config doesn't really use this information right now)
 				if (FirmwareDatabase.FirmwareFilesByHash.TryGetValue(rff.Hash, out var ff))
 				{
 					ri.KnownFirmwareFile = ff;
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs
index 5d93ad71a6..4c09123172 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs
@@ -16,7 +16,7 @@ using BizHawk.Emulation.Common;
 // notes: eventually, we intend to have a "firmware acquisition interface" exposed to the emulator cores.
 // it will be implemented by EmuHawk, and use firmware keys to fetch the firmware content.
 // however, for now, the cores are using strings from the config class. so we have the `configMember` which is
-// used by reflection to set the configuration for firmwares which were found
+// used by reflection to set the configuration for firmware which were found
 
 // TODO - we may eventually need to add a progress dialog for this. we should have one for other reasons.
 // I started making one in BizHawk.Util as QuickProgressPopup but ran out of time
@@ -162,7 +162,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		// makes sure that the specified SystemId is selected in the list (and that all the firmwares for it are visible)
+		// makes sure that the specified SystemId is selected in the list (and that all the firmware for it is visible)
 		private void WarpToSystemId(string sysId)
 		{
 			bool selectedFirst = false;
@@ -460,7 +460,7 @@ namespace BizHawk.Client.EmuHawk
 					var filePath = result;
 
 					// if the selected file is an archive, allow the user to pick the inside file
-					// to always be copied to the global firmwares directory
+					// to always be copied to the global firmware directory
 					if (hf.IsArchive)
 					{
 						var ac = new ArchiveChooser(new HawkFile(filePath));
@@ -469,7 +469,7 @@ namespace BizHawk.Client.EmuHawk
 						var insideFile = hf.BindArchiveMember(ac.SelectedMemberIndex);
 						var fileData = insideFile.ReadAllBytes();
 
-						// write to file in the firmwares folder
+						// write to file in the firmware folder
 						File.WriteAllBytes(Path.Combine(firmwarePath, insideFile.Name), fileData);
 						filePath = Path.Combine(firmwarePath, insideFile.Name);
 					}
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
index 612685555c..f8849dd177 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
@@ -322,7 +322,7 @@ namespace BizHawk.Emulation.Common
 			// full hash according to nointro, although incomplete dumps work just as well...
 			FirmwareAndOption("719B9EEF33692406D7170FF526069615759C4DFC", 65536, "NDS", "bios9i", "NDS_Bios9i.bin", "ARM9i BIOS");
 			Firmware("NDS", "firmware", "NDS Firmware");
-			// throwing a ton of hashes from various reported firmwares
+			// throwing a ton of hashes from various reported firmware
 			// TODO: Probably should just add in no-intro hashes
 			var knownhack1 = File("22A7547DBC302BCBFB4005CFB5A2D426D3F85AC6", 262144, "NDS_Firmware [b1].bin", "NDS Firmware", "known hack", true);
 			var knownhack2 = File("AE22DE59FBF3F35CCFBEACAEBA6FA87AC5E7B14B", 262144, "NDS_Firmware [b2].bin", "NDS Firmware", "known hack", true);
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 31a8c88ade..c9c150d44c 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -151,7 +151,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 				}
 			}
 
-			//TODO - known bad firmwares are a no-go. we should refuse to boot them. (that's the mednafen policy)
+			//TODO - known bad firmware is a no-go. we should refuse to boot them. (that's the mednafen policy)
 			var firmware = comm.CoreFileProvider.GetFirmwareOrThrow(new("PSX", firmwareRegion), $"A PSX `{firmwareRegion}` region bios file is required");
 
 			//create the instance
diff --git a/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs b/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
index 36b31b7cf5..f23a330c81 100644
--- a/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
+++ b/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
@@ -37,7 +37,7 @@ namespace BizHawk.Emulation.Cores
 		public TSync SyncSettings { get; set; }
 		/// <summary>
 		/// All roms that should be loaded as part of this core load.
-		/// Order may be significant.  Does not include firmwares or other general resources.
+		/// Order may be significant. Does not include firmware or other general resources.
 		/// </summary>
 		public List<IRomAsset> Roms { get; set; } = new List<IRomAsset>();
 		/// <summary>
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/LibNymaCore.cs b/src/BizHawk.Emulation.Cores/Waterbox/LibNymaCore.cs
index 532bb114b0..b99f42677e 100644
--- a/src/BizHawk.Emulation.Cores/Waterbox/LibNymaCore.cs
+++ b/src/BizHawk.Emulation.Cores/Waterbox/LibNymaCore.cs
@@ -179,7 +179,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
 
 		public delegate void FrontendFirmwareNotify(string name);
 		/// <summary>
-		/// Set a callback to be called whenever the core calls MDFN_MakeFName for a firmware, so that we can load firmwares on demand
+		/// Set a callback to be called whenever the core calls MDFN_MakeFName for a firmware, so that we can load firmware on demand
 		/// </summary>
 		[BizImport(CC)]
 		public abstract void SetFrontendFirmwareNotify(FrontendFirmwareNotify cb);
diff --git a/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs b/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs
index 5d5e018fe9..7be4cbcf12 100644
--- a/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs
+++ b/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs
@@ -90,7 +90,7 @@ namespace BizHawk.Tests.Testroms.GB
 		}
 
 		/// <summary>
-		/// set-up firmwares on <paramref name="efp"/>, optionally setting <paramref name="config"/>, then
+		/// set-up firmware on <paramref name="efp"/>, optionally setting <paramref name="config"/>, then
 		/// initialise and return a core instance (<paramref name="coreComm"/> is provided),
 		/// and optionally specify a frame number to seek to (e.g. to skip BIOS screens)
 		/// </summary>