diff --git a/BizHawk.Client.Common/cheats/NESGameGenieEncoderDecoder.cs b/BizHawk.Client.Common/cheats/NesGameGenieDecoder.cs
similarity index 97%
rename from BizHawk.Client.Common/cheats/NESGameGenieEncoderDecoder.cs
rename to BizHawk.Client.Common/cheats/NesGameGenieDecoder.cs
index 48a7c8a9db..c3139cbb4a 100644
--- a/BizHawk.Client.Common/cheats/NESGameGenieEncoderDecoder.cs
+++ b/BizHawk.Client.Common/cheats/NesGameGenieDecoder.cs
@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.Common
 {
-	public class NESGameGenieDecoder
+	public class NesGameGenieDecoder
 	{
 		private readonly string _code;
 
@@ -26,7 +26,7 @@ namespace BizHawk.Client.Common
 			['N'] =  15  // 1111
 		};
 
-		public NESGameGenieDecoder(string code)
+		public NesGameGenieDecoder(string code)
 		{
 			_code = code;
 			Decode();
diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs
index e336173f62..b37a816fe5 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs
@@ -44,7 +44,7 @@ namespace BizHawk.Client.Common
 		{
 			if (NESAvailable && MemoryDomains != null)
 			{
-				var decoder = new NESGameGenieDecoder(code);
+				var decoder = new NesGameGenieDecoder(code);
 				var watch = Watch.GenerateWatch(
 					MemoryDomains["System Bus"],
 					decoder.Address,
@@ -126,7 +126,7 @@ namespace BizHawk.Client.Common
 		{
 			if (NESAvailable)
 			{
-				var decoder = new NESGameGenieDecoder(code);
+				var decoder = new NesGameGenieDecoder(code);
 				Global.CheatList.RemoveRange(
 					Global.CheatList.Where(c => c.Address == decoder.Address));
 			}
diff --git a/BizHawk.Client.EmuHawk/tools/GameShark.cs b/BizHawk.Client.EmuHawk/tools/GameShark.cs
index da2c18cf92..c33d35e499 100644
--- a/BizHawk.Client.EmuHawk/tools/GameShark.cs
+++ b/BizHawk.Client.EmuHawk/tools/GameShark.cs
@@ -2527,7 +2527,7 @@ namespace BizHawk.Client.EmuHawk
 				MessageBox.Show("Game Genie codes need to be six or eight characters in length.", "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 
-			var decoder = new NESGameGenieDecoder(_singleCheat);
+			var decoder = new NesGameGenieDecoder(_singleCheat);
 
 			try
 			{