diff --git a/BizHawk.Client.EmuHawk/ToolAttributes.cs b/BizHawk.Client.EmuHawk/ToolAttributes.cs
index 93ccf61a03..1ba2a2c1ef 100644
--- a/BizHawk.Client.EmuHawk/ToolAttributes.cs
+++ b/BizHawk.Client.EmuHawk/ToolAttributes.cs
@@ -4,9 +4,9 @@ using System.Collections.Generic;
 namespace BizHawk.Client.EmuHawk
 {
 	[AttributeUsage(AttributeTargets.Class)]
-	public class ToolAttributes : Attribute
+	public class ToolAttribute : Attribute
 	{
-		public ToolAttributes(bool released, string[] supportedSystems)
+		public ToolAttribute(bool released, string[] supportedSystems)
 		{
 			Released = released;
 			SupportedSystems = supportedSystems;
diff --git a/BizHawk.Client.EmuHawk/tools/AutoHawk.cs b/BizHawk.Client.EmuHawk/tools/AutoHawk.cs
index cda238bcfb..c1674db0ee 100644
--- a/BizHawk.Client.EmuHawk/tools/AutoHawk.cs
+++ b/BizHawk.Client.EmuHawk/tools/AutoHawk.cs
@@ -11,7 +11,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	[ToolAttributes(released: false, supportedSystems: null)]
+	[Tool(released: false, supportedSystems: null)]
 	public partial class AutoHawk : Form, IToolFormAutoConfig
 	{
 		public AutoHawk()
diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
index 067ce4579f..5a3bc87264 100644
--- a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
@@ -9,7 +9,7 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	[ToolAttributes(false, null)]
+	[Tool(false, null)]
 	public partial class GBGameGenie : Form, IToolFormAutoConfig
 	{
 		// TODO: fix the use of Global.Game.System and Emulator.SystemId
diff --git a/BizHawk.Client.EmuHawk/tools/GameShark.cs b/BizHawk.Client.EmuHawk/tools/GameShark.cs
index 5cfa34325b..08a9a8b62f 100644
--- a/BizHawk.Client.EmuHawk/tools/GameShark.cs
+++ b/BizHawk.Client.EmuHawk/tools/GameShark.cs
@@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk
 	//Verify all wording in the error reports
 
 
-	[ToolAttributes(released: true, supportedSystems: new[] { "GB", "GBA", "GEN", "N64", "NES", "PSX", "SAT", "SMS", "SNES" })]
+	[Tool(released: true, supportedSystems: new[] { "GB", "GBA", "GEN", "N64", "NES", "PSX", "SAT", "SMS", "SNES" })]
 	public partial class GameShark : Form, IToolForm, IToolFormAutoConfig
 	{
 		#region " Game Genie Dictionary "
diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
index c5fbb00465..dd4f38c0d7 100644
--- a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
@@ -12,7 +12,7 @@ using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
 
 namespace BizHawk.Client.EmuHawk
 {
-	[ToolAttributes(false, null)]
+	[Tool(false, null)]
 	public partial class GenGameGenie : Form, IToolFormAutoConfig
 	{
 		#pragma warning disable 675
diff --git a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
index 9abf6e37be..5044b98271 100644
--- a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
+++ b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
@@ -10,7 +10,7 @@ using BizHawk.Client.EmuHawk.ToolExtensions;
 
 namespace BizHawk.Client.EmuHawk
 {
-	[ToolAttributes(false, null)]
+	[Tool(false, null)]
 	public partial class MacroInputTool : Form, IToolFormAutoConfig
 	{
 		[RequiredService]
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
index dca9185bc8..0b6912c602 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
@@ -8,7 +8,7 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	[ToolAttributes(false, null)]
+	[Tool(false, null)]
 	public partial class NESGameGenie : Form, IToolFormAutoConfig
 	{
 		[RequiredService]
diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
index 7d94ecefb1..19fd60cea5 100644
--- a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
@@ -10,7 +10,7 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	[ToolAttributes(false, null)]
+	[Tool(false, null)]
 	public partial class SNESGameGenie : Form, IToolFormAutoConfig
 	{
 		[RequiredService]
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index e20df010ad..503714c6b1 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -60,7 +60,7 @@ namespace BizHawk.Client.EmuHawk
 					continue;
 				if (typeof(ToolBox).IsAssignableFrom(t))  //yo dawg i head you like toolboxes
 					continue;
-				if (VersionInfo.DeveloperBuild && t.GetCustomAttributes(false).OfType<ToolAttributes>().Any(a => !a.Released))
+				if (VersionInfo.DeveloperBuild && t.GetCustomAttributes(false).OfType<ToolAttribute>().Any(a => !a.Released))
 					continue;
 				if (t == typeof(GBGameGenie)) // Hack, this tool is specific to a system id and a sub-system (gb and gg) we have no reasonable way to declare a dependency like that
 					continue;
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index aedc964119..bd5e0c9bdd 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -740,7 +740,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			var attr = tool.GetCustomAttributes(false)
-				.OfType<ToolAttributes>()
+				.OfType<ToolAttribute>()
 				.FirstOrDefault();
 
 			// If no supported systems mentioned assume all