diff --git a/OpenRA.Mods.Common/Traits/Crates/GiveMcvCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/GiveBaseBuilderCrateAction.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Crates/GiveMcvCrateAction.cs
rename to OpenRA.Mods.Common/Traits/Crates/GiveBaseBuilderCrateAction.cs
diff --git a/OpenRA.Mods.Common/Traits/FireWarheadOnDeath.cs b/OpenRA.Mods.Common/Traits/FireWarheadsOnDeath.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/FireWarheadOnDeath.cs
rename to OpenRA.Mods.Common/Traits/FireWarheadsOnDeath.cs
diff --git a/OpenRA.Mods.Common/Traits/Tooltip.cs b/OpenRA.Mods.Common/Traits/Tooltip.cs
index d985f12312..d7875e6b2f 100644
--- a/OpenRA.Mods.Common/Traits/Tooltip.cs
+++ b/OpenRA.Mods.Common/Traits/Tooltip.cs
@@ -21,11 +21,13 @@ namespace OpenRA.Mods.Common.Traits
 	}
 
 	[Desc("Shown in map editor.")]
-	public class EditorOnlyTooltipInfo : TooltipInfoBase
+	public sealed class EditorOnlyTooltipInfo : TooltipInfoBase
 	{
-		public override object Create(ActorInitializer init) { return this; }
+		public override object Create(ActorInitializer init) { return new EditorOnlyTooltip(); }
 	}
 
+	public sealed class EditorOnlyTooltip { }
+
 	[Desc("Shown in the build palette widget.")]
 	public class TooltipInfo : TooltipInfoBase, ITooltipInfo
 	{