diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index 779f609537..5b045766be 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -10,7 +10,7 @@ namespace BizHawk.Client.Common
 
 		public static Config Config;
 		public static GameInfo Game;
-		public static CheatList CheatList;
+		public static CheatCollection CheatList;
 		public static FirmwareManager FirmwareManager;
 
 		//Movie
diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs
index 7baa544caf..1e005efca7 100644
--- a/BizHawk.Client.Common/tools/CheatList.cs
+++ b/BizHawk.Client.Common/tools/CheatList.cs
@@ -9,7 +9,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
-	public class CheatList : ICollection<Cheat>, IEnumerable<Cheat>
+	public class CheatCollection : ICollection<Cheat>
 	{
 		private bool _changes;
 		public bool Changes
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 6e9a4fe243..a0f2a59c16 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -83,7 +83,7 @@ namespace BizHawk.Client.EmuHawk
 
 			FFMpeg.FFMpegPath = PathManager.MakeProgramRelativePath(Global.Config.FFMpegPath);
 
-			Global.CheatList = new CheatList();
+			Global.CheatList = new CheatCollection();
 			Global.CheatList.Changed += ToolHelpers.UpdateCheatRelatedTools;
 			
 			UpdateStatusSlots();
diff --git a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
index 45a4542490..20b61e5c4a 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
@@ -205,7 +205,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public static void UpdateCheatRelatedTools(object sender, CheatList.CheatListEventArgs e)
+		public static void UpdateCheatRelatedTools(object sender, CheatCollection.CheatListEventArgs e)
 		{
 			GlobalWin.Tools.UpdateValues<RamWatch>();
 			GlobalWin.Tools.UpdateValues<RamSearch>();