diff --git a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
index f288bd1072..9cb813fa8a 100644
--- a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
+++ b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
@@ -16,7 +16,7 @@ using BizHawk.Client.Common.Filters;
 using BizHawk.Common.CollectionExtensions;
 using BizHawk.Common.PathExtensions;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores.Consoles.Nintendo._3DS;
+using BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS;
 using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
 using BizHawk.Emulation.Cores.Sony.PSX;
 
diff --git a/src/BizHawk.Client.Common/DisplayManager/Filters/Gui.cs b/src/BizHawk.Client.Common/DisplayManager/Filters/Gui.cs
index ce6d80e7a5..903a789aa6 100644
--- a/src/BizHawk.Client.Common/DisplayManager/Filters/Gui.cs
+++ b/src/BizHawk.Client.Common/DisplayManager/Filters/Gui.cs
@@ -4,7 +4,7 @@ using System.Drawing;
 using BizHawk.Bizware.BizwareGL;
 using BizHawk.Client.Common.FilterManager;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores.Consoles.Nintendo._3DS;
+using BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS;
 using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
 
 namespace BizHawk.Client.Common.Filters
diff --git a/src/BizHawk.Client.Common/RomGame.cs b/src/BizHawk.Client.Common/RomGame.cs
index 8f4e62cc48..07c25bd2d8 100644
--- a/src/BizHawk.Client.Common/RomGame.cs
+++ b/src/BizHawk.Client.Common/RomGame.cs
@@ -57,7 +57,7 @@ namespace BizHawk.Client.Common
 				GameInfo = new()
 				{
 					Name = Path.GetFileNameWithoutExtension(file.Name).Replace('_', ' '),
-					System = VSystemID.Raw._3DS,
+					System = VSystemID.Raw.N3DS,
 					Hash = "N/A",
 					Status = RomStatus.NotInDatabase,
 					NotInDatabase = true
diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
index 7efc6ffd60..b4c296a817 100644
--- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs
+++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
@@ -64,7 +64,7 @@ namespace BizHawk.Client.Common
 			[VSystemID.Raw.Sega32X] = "Sega 32X",
 			[VSystemID.Raw.GGL] = "Dual Game Gear",
 			[VSystemID.Raw.Satellaview] = "Satellaview",
-			[VSystemID.Raw._3DS] = "3DS"
+			[VSystemID.Raw.N3DS] = "3DS"
 		};
 
 		private static PathEntry BaseEntryFor(string sysID, string path)
@@ -191,9 +191,9 @@ namespace BizHawk.Client.Common
 				new(GLOBAL, "Temp Files", ""),
 			},
 
-			CommonEntriesFor(VSystemID.Raw._3DS, basePath: Path.Combine(".", "3DS"), omitSaveRAM: true),
+			CommonEntriesFor(VSystemID.Raw.N3DS, basePath: Path.Combine(".", "3DS"), omitSaveRAM: true),
 			new[] {
-				UserEntryFor(VSystemID.Raw._3DS),
+				UserEntryFor(VSystemID.Raw.N3DS),
 			},
 
 			CommonEntriesFor(VSystemID.Raw.Sega32X, basePath: Path.Combine(".", "32X")),
diff --git a/src/BizHawk.Emulation.Common/Extensions.cs b/src/BizHawk.Emulation.Common/Extensions.cs
index d08c089cf8..42a1b28193 100644
--- a/src/BizHawk.Emulation.Common/Extensions.cs
+++ b/src/BizHawk.Emulation.Common/Extensions.cs
@@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Common
 		/// <remarks>need to think about e.g. Genesis / Mega Drive using one sysID but having a different display name depending on the BIOS region --yoshi</remarks>
 		public static readonly IReadOnlyDictionary<string, string> SystemIDDisplayNames = new Dictionary<string, string>
 		{
-			[VSystemID.Raw._3DS] = "3DS",
 			[VSystemID.Raw.A26] = "Atari 2600",
 			[VSystemID.Raw.A78] = "Atari 7800",
 			[VSystemID.Raw.AmstradCPC] = "Amstrad CPC",
@@ -41,6 +40,7 @@ namespace BizHawk.Emulation.Common
 			[VSystemID.Raw.Libretro] = "Libretro",
 			[VSystemID.Raw.Lynx] = "Lynx",
 			[VSystemID.Raw.MSX] = "MSX",
+			[VSystemID.Raw.N3DS] = "3DS",
 			[VSystemID.Raw.N64] = "Nintendo 64",
 			[VSystemID.Raw.NDS] = "NDS",
 			[VSystemID.Raw.NES] = "NES",
diff --git a/src/BizHawk.Emulation.Common/VSystemID.cs b/src/BizHawk.Emulation.Common/VSystemID.cs
index 789113248c..86a3c6dd76 100644
--- a/src/BizHawk.Emulation.Common/VSystemID.cs
+++ b/src/BizHawk.Emulation.Common/VSystemID.cs
@@ -14,7 +14,6 @@ namespace BizHawk.Emulation.Common
 	{
 		public static class Raw
 		{
-			public const string _3DS = "3DS";
 			public const string A26 = "A26";
 			public const string A78 = "A78";
 			public const string Amiga = "Amiga";
@@ -39,6 +38,7 @@ namespace BizHawk.Emulation.Common
 			public const string Libretro = "Libretro";
 			public const string Lynx = "Lynx";
 			public const string MSX = "MSX";
+			public const string N3DS = "3DS";
 			public const string N64 = "N64";
 			public const string NDS = "NDS";
 			public const string NeoGeoCD = "NeoGeoCD";
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/3DSMotionEmu.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/3DSMotionEmu.cs
index 73b8022a67..a2001e34ec 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/3DSMotionEmu.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/3DSMotionEmu.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Numerics;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public class _3DSMotionEmu
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IEmulator.cs
index d85ee698db..3f3917ecf2 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IEmulator.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IEmulator.cs
@@ -1,6 +1,6 @@
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public partial class Citra : IEmulator
 	{
@@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
 
 		public int Frame { get; set; }
 
-		public string SystemId => VSystemID.Raw._3DS;
+		public string SystemId => VSystemID.Raw.N3DS;
 
 		public bool DeterministicEmulation { get; }
 
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IInputPollable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IInputPollable.cs
index 88a6f56d75..120fea0b27 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IInputPollable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IInputPollable.cs
@@ -3,7 +3,7 @@ using System;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public partial class Citra : IInputPollable
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IMemoryDomains.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IMemoryDomains.cs
index fc3af92754..e98b51a1df 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IMemoryDomains.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IMemoryDomains.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public partial class Citra
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISettable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISettable.cs
index 59483a6d96..9daecd1d89 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISettable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISettable.cs
@@ -8,7 +8,7 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public partial class Citra : ISettable<Citra.CitraSettings, Citra.CitraSyncSettings>
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISoundProvider.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISoundProvider.cs
index d8895daedf..53e2bdfd64 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISoundProvider.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISoundProvider.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public partial class Citra : ISoundProvider
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IStatable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IStatable.cs
index d99d9695d0..a00ef69524 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IStatable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IStatable.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public partial class Citra : IStatable
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IVideoProvider.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IVideoProvider.cs
index 2ad32b0b68..40dc600a97 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IVideoProvider.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IVideoProvider.cs
@@ -2,7 +2,7 @@ using System;
 
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public class CitraVideoProvider : IVideoProvider
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.cs
index e895877b59..1ba59cc28f 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.cs
@@ -9,7 +9,7 @@ using BizHawk.BizInvoke;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	[PortedCore(CoreNames.Citra, "Citra Emulator Project", "nightly-1953", "https://citra-emu.org", singleInstance: true, isReleased: false)]
 	[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })]
@@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
 		public bool TouchScreenRotated { get; private set; }
 		public bool TouchScreenEnabled { get; private set; }
 
-		[CoreConstructor(VSystemID.Raw._3DS)]
+		[CoreConstructor(VSystemID.Raw.N3DS)]
 		public Citra(CoreLoadParameters<CitraSettings, CitraSyncSettings> lp)
 		{
 			if (lp.Roms.Exists(r => r.RomPath.Contains("|")))
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibCitra.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibCitra.cs
index f116ceec1c..1b199fa84b 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibCitra.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibCitra.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 using BizHawk.BizInvoke;
 
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 {
 	public abstract class LibCitra
 	{