diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index 3a2385b2a6..6e6b7c44ba 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -891,7 +891,7 @@ namespace BizHawk.Client.Common
 
 							if (useSnes9x)
 							{
-								core = CoreInventory.Instance["SNES", "Snes9x"];
+								core = CoreInventory.Instance["SNES", CoreNames.Snes9X];
 							}
 							else
 							{
@@ -946,7 +946,7 @@ namespace BizHawk.Client.Common
 								}
 								else
 								{
-									core = CoreInventory.Instance["SGB", "SameBoy"];
+									core = CoreInventory.Instance["SGB", CoreNames.SameBoy];
 								}
 							}
 							break;
@@ -980,16 +980,16 @@ namespace BizHawk.Client.Common
 						case "GEN":
 							if (Global.Config.CoreForcingViaGameDb && game.ForcedCore?.ToLower() == "pico")
 							{
-								core = CoreInventory.Instance["GEN", "PicoDrive"];
+								core = CoreInventory.Instance["GEN", CoreNames.PicoDrive];
 							}
 							else
 							{
-								core = CoreInventory.Instance["GEN", "Genplus-gx"];
+								core = CoreInventory.Instance["GEN", CoreNames.Gpgx];
 							}
 
 							break;
 						case "32X":
-							core = CoreInventory.Instance["GEN", "PicoDrive"];
+							core = CoreInventory.Instance["GEN", CoreNames.PicoDrive];
 							break;
 					}
 
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
index 257d172c50..24571fe3fb 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
@@ -10,7 +10,7 @@ using System.Linq;
 
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy
 {
-	[Core("SameBoy", "LIJI32", true, true, "efc11783c7fb6da66e1dd084e41ba6a85c0bd17e",
+	[Core(CoreNames.SameBoy, "LIJI32", true, true, "efc11783c7fb6da66e1dd084e41ba6a85c0bd17e",
 		"https://sameboy.github.io/", false)]
 	public class Sameboy : WaterboxCore,
 		IGameboyCommon, ISaveRam,
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs
index 1c2dd0da78..61b310e89d 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs
@@ -9,7 +9,7 @@ using System.ComponentModel;
 
 namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive
 {
-	[Core("PicoDrive", "notaz", true, true,
+	[Core(CoreNames.PicoDrive, "notaz", true, true,
 		"0e352905c7aa80b166933970abbcecfce96ad64e", "https://github.com/notaz/picodrive", false)]
 	public class PicoDrive : WaterboxCore, IDriveLight, IRegionable, ISettable<object, PicoDrive.SyncSettings>
 	{
@@ -24,10 +24,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive
 			: this(comm, game, rom, null, deterministic, syncSettings)
 		{ }
 
-		public PicoDrive(CoreComm comm, GameInfo game, Disc cd, bool deterministic, SyncSettings syncSettings)
-			: this(comm, game, null, cd, deterministic, syncSettings)
-		{ }
-
 		private PicoDrive(CoreComm comm, GameInfo game, byte[] rom, Disc cd, bool deterministic, SyncSettings syncSettings)
 			: base(comm, new Configuration
 			{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
index 26d010e658..75aeca1593 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
@@ -12,7 +12,7 @@ using System.Linq;
 namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 {
 	[Core(
-		"Genplus-gx",
+		CoreNames.Gpgx,
 		"",
 		isPorted: true,
 		isReleased: true,
diff --git a/src/BizHawk.Emulation.Cores/CoreNames.cs b/src/BizHawk.Emulation.Cores/CoreNames.cs
index a8c9e907c0..363d361d2f 100644
--- a/src/BizHawk.Emulation.Cores/CoreNames.cs
+++ b/src/BizHawk.Emulation.Cores/CoreNames.cs
@@ -18,5 +18,8 @@ namespace BizHawk.Emulation.Cores
 		public const string GbHawk = "GBHawk";
 		public const string Gambatte = "Gambatte";
 		public const string SubGbHawk = "SubGBHawk";
+		public const string SameBoy = "SameBoy";
+		public const string PicoDrive = "PicoDrive";
+		public const string Gpgx = "Genplus-gx";
 	}
 }