diff --git a/SabreTools.Data.Models/Metadata/Adjuster.cs b/SabreTools.Data.Models/Metadata/Adjuster.cs
index 93a92165..b8708904 100644
--- a/SabreTools.Data.Models/Metadata/Adjuster.cs
+++ b/SabreTools.Data.Models/Metadata/Adjuster.cs
@@ -21,9 +21,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>bool</remarks>
         public const string DefaultKey = "default";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         #endregion
 
         public Adjuster() => ItemType = ItemType.Adjuster;
diff --git a/SabreTools.Data.Models/Metadata/Archive.cs b/SabreTools.Data.Models/Metadata/Archive.cs
index 12280858..7217d9ba 100644
--- a/SabreTools.Data.Models/Metadata/Archive.cs
+++ b/SabreTools.Data.Models/Metadata/Archive.cs
@@ -29,9 +29,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string, No-Intro DB extension</remarks>
         public const string MergeNameKey = "mergename";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string, No-Intro DB extension</remarks>
         public const string NameAltKey = "name_alt";
 
diff --git a/SabreTools.Data.Models/Metadata/BiosSet.cs b/SabreTools.Data.Models/Metadata/BiosSet.cs
index e5026427..86dd5efd 100644
--- a/SabreTools.Data.Models/Metadata/BiosSet.cs
+++ b/SabreTools.Data.Models/Metadata/BiosSet.cs
@@ -20,9 +20,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string DescriptionKey = "description";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         #endregion
 
         public BiosSet() => ItemType = ItemType.BiosSet;
diff --git a/SabreTools.Data.Models/Metadata/Chip.cs b/SabreTools.Data.Models/Metadata/Chip.cs
index 29717274..0a8860cc 100644
--- a/SabreTools.Data.Models/Metadata/Chip.cs
+++ b/SabreTools.Data.Models/Metadata/Chip.cs
@@ -20,9 +20,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string FlagsKey = "flags";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>(yes|no) "no"</remarks>
         public const string SoundOnlyKey = "soundonly";
 
diff --git a/SabreTools.Data.Models/Metadata/ConfLocation.cs b/SabreTools.Data.Models/Metadata/ConfLocation.cs
index 84f95648..9fe02618 100644
--- a/SabreTools.Data.Models/Metadata/ConfLocation.cs
+++ b/SabreTools.Data.Models/Metadata/ConfLocation.cs
@@ -17,9 +17,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>(yes|no) "no"</remarks>
         public const string InvertedKey = "inverted";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string, possibly long</remarks>
         public const string NumberKey = "number";
 
diff --git a/SabreTools.Data.Models/Metadata/ConfSetting.cs b/SabreTools.Data.Models/Metadata/ConfSetting.cs
index 8f61ce32..996d2b0f 100644
--- a/SabreTools.Data.Models/Metadata/ConfSetting.cs
+++ b/SabreTools.Data.Models/Metadata/ConfSetting.cs
@@ -21,9 +21,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>(yes|no) "no"</remarks>
         public const string DefaultKey = "default";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string ValueKey = "value";
 
diff --git a/SabreTools.Data.Models/Metadata/Configuration.cs b/SabreTools.Data.Models/Metadata/Configuration.cs
index 120ba827..d261bb88 100644
--- a/SabreTools.Data.Models/Metadata/Configuration.cs
+++ b/SabreTools.Data.Models/Metadata/Configuration.cs
@@ -29,9 +29,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string MaskKey = "mask";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string TagKey = "tag";
 
diff --git a/SabreTools.Data.Models/Metadata/DataArea.cs b/SabreTools.Data.Models/Metadata/DataArea.cs
index 2ad809ae..5bc474cf 100644
--- a/SabreTools.Data.Models/Metadata/DataArea.cs
+++ b/SabreTools.Data.Models/Metadata/DataArea.cs
@@ -17,9 +17,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>(big|little) "little"</remarks>
         public const string EndiannessKey = "endianness";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>Rom[]</remarks>
         [NoFilter]
         public const string RomKey = "rom";
diff --git a/SabreTools.Data.Models/Metadata/DeviceRef.cs b/SabreTools.Data.Models/Metadata/DeviceRef.cs
index 6da889da..edfdf54d 100644
--- a/SabreTools.Data.Models/Metadata/DeviceRef.cs
+++ b/SabreTools.Data.Models/Metadata/DeviceRef.cs
@@ -12,13 +12,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #endregion
 
-        #region Keys
-
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
-        #endregion
-
         public DeviceRef() => ItemType = ItemType.DeviceRef;
     }
 }
diff --git a/SabreTools.Data.Models/Metadata/DipLocation.cs b/SabreTools.Data.Models/Metadata/DipLocation.cs
index 3a344d33..58dde81e 100644
--- a/SabreTools.Data.Models/Metadata/DipLocation.cs
+++ b/SabreTools.Data.Models/Metadata/DipLocation.cs
@@ -17,9 +17,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>(yes|no) "no"</remarks>
         public const string InvertedKey = "inverted";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string, possibly long</remarks>
         public const string NumberKey = "number";
 
diff --git a/SabreTools.Data.Models/Metadata/DipSwitch.cs b/SabreTools.Data.Models/Metadata/DipSwitch.cs
index 6538d0a8..fe5127be 100644
--- a/SabreTools.Data.Models/Metadata/DipSwitch.cs
+++ b/SabreTools.Data.Models/Metadata/DipSwitch.cs
@@ -35,9 +35,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string MaskKey = "mask";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string TagKey = "tag";
 
diff --git a/SabreTools.Data.Models/Metadata/DipValue.cs b/SabreTools.Data.Models/Metadata/DipValue.cs
index f4416636..b8415547 100644
--- a/SabreTools.Data.Models/Metadata/DipValue.cs
+++ b/SabreTools.Data.Models/Metadata/DipValue.cs
@@ -21,9 +21,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>(yes|no) "no"</remarks>
         public const string DefaultKey = "default";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string ValueKey = "value";
 
diff --git a/SabreTools.Data.Models/Metadata/Disk.cs b/SabreTools.Data.Models/Metadata/Disk.cs
index ebb019f8..f67a0b8e 100644
--- a/SabreTools.Data.Models/Metadata/Disk.cs
+++ b/SabreTools.Data.Models/Metadata/Disk.cs
@@ -26,9 +26,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string MergeKey = "merge";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>(yes|no) "no"</remarks>
         public const string OptionalKey = "optional";
 
diff --git a/SabreTools.Data.Models/Metadata/DiskArea.cs b/SabreTools.Data.Models/Metadata/DiskArea.cs
index 5cd92483..87e68a86 100644
--- a/SabreTools.Data.Models/Metadata/DiskArea.cs
+++ b/SabreTools.Data.Models/Metadata/DiskArea.cs
@@ -18,9 +18,6 @@ namespace SabreTools.Data.Models.Metadata
         [NoFilter]
         public const string DiskKey = "disk";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         #endregion
 
         public DiskArea() => ItemType = ItemType.DiskArea;
diff --git a/SabreTools.Data.Models/Metadata/Extension.cs b/SabreTools.Data.Models/Metadata/Extension.cs
index d5c912a1..ff5f9808 100644
--- a/SabreTools.Data.Models/Metadata/Extension.cs
+++ b/SabreTools.Data.Models/Metadata/Extension.cs
@@ -12,13 +12,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #endregion
 
-        #region Keys
-
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
-        #endregion
-
         public Extension() => ItemType = ItemType.Extension;
     }
 }
diff --git a/SabreTools.Data.Models/Metadata/Feature.cs b/SabreTools.Data.Models/Metadata/Feature.cs
index 3ecadbe0..2195c262 100644
--- a/SabreTools.Data.Models/Metadata/Feature.cs
+++ b/SabreTools.Data.Models/Metadata/Feature.cs
@@ -14,9 +14,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #region Keys
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>(unemulated|imperfect)</remarks>
         public const string OverallKey = "overall";
 
diff --git a/SabreTools.Data.Models/Metadata/Header.cs b/SabreTools.Data.Models/Metadata/Header.cs
index 0851a8bc..9ed506ee 100644
--- a/SabreTools.Data.Models/Metadata/Header.cs
+++ b/SabreTools.Data.Models/Metadata/Header.cs
@@ -98,9 +98,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string MameConfigKey = "mameconfig";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// TODO: This needs an internal model OR mapping to fields
         /// <remarks>NewDat</remarks>
         [NoFilter]
diff --git a/SabreTools.Data.Models/Metadata/Info.cs b/SabreTools.Data.Models/Metadata/Info.cs
index 380b8eb1..7adec396 100644
--- a/SabreTools.Data.Models/Metadata/Info.cs
+++ b/SabreTools.Data.Models/Metadata/Info.cs
@@ -14,9 +14,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #region Keys
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string ValueKey = "value";
 
diff --git a/SabreTools.Data.Models/Metadata/Instance.cs b/SabreTools.Data.Models/Metadata/Instance.cs
index bcf5f4f4..2d07298a 100644
--- a/SabreTools.Data.Models/Metadata/Instance.cs
+++ b/SabreTools.Data.Models/Metadata/Instance.cs
@@ -17,9 +17,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string BriefNameKey = "briefname";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         #endregion
 
         public Instance() => ItemType = ItemType.Instance;
diff --git a/SabreTools.Data.Models/Metadata/Machine.cs b/SabreTools.Data.Models/Metadata/Machine.cs
index 0bccb4fb..82ccf0e1 100644
--- a/SabreTools.Data.Models/Metadata/Machine.cs
+++ b/SabreTools.Data.Models/Metadata/Machine.cs
@@ -168,9 +168,6 @@ namespace SabreTools.Data.Models.Metadata
         [NoFilter]
         public const string MediaKey = "media";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string NotesKey = "notes";
 
diff --git a/SabreTools.Data.Models/Metadata/Media.cs b/SabreTools.Data.Models/Metadata/Media.cs
index ee974675..cb45c2cc 100644
--- a/SabreTools.Data.Models/Metadata/Media.cs
+++ b/SabreTools.Data.Models/Metadata/Media.cs
@@ -17,9 +17,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string MD5Key = "md5";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string SHA1Key = "sha1";
 
diff --git a/SabreTools.Data.Models/Metadata/Part.cs b/SabreTools.Data.Models/Metadata/Part.cs
index 1e2a969e..49dd52fd 100644
--- a/SabreTools.Data.Models/Metadata/Part.cs
+++ b/SabreTools.Data.Models/Metadata/Part.cs
@@ -33,9 +33,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string InterfaceKey = "interface";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         #endregion
 
         public Part() => ItemType = ItemType.Part;
diff --git a/SabreTools.Data.Models/Metadata/RamOption.cs b/SabreTools.Data.Models/Metadata/RamOption.cs
index abe5f9b6..b2b82a99 100644
--- a/SabreTools.Data.Models/Metadata/RamOption.cs
+++ b/SabreTools.Data.Models/Metadata/RamOption.cs
@@ -20,9 +20,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>(yes|no) "no"</remarks>
         public const string DefaultKey = "default";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         #endregion
 
         public RamOption() => ItemType = ItemType.RamOption;
diff --git a/SabreTools.Data.Models/Metadata/Release.cs b/SabreTools.Data.Models/Metadata/Release.cs
index e32520a3..ae3ef67a 100644
--- a/SabreTools.Data.Models/Metadata/Release.cs
+++ b/SabreTools.Data.Models/Metadata/Release.cs
@@ -23,9 +23,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string LanguageKey = "language";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string RegionKey = "region";
 
diff --git a/SabreTools.Data.Models/Metadata/Rom.cs b/SabreTools.Data.Models/Metadata/Rom.cs
index 2e97dfe7..99648714 100644
--- a/SabreTools.Data.Models/Metadata/Rom.cs
+++ b/SabreTools.Data.Models/Metadata/Rom.cs
@@ -143,9 +143,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>(yes|no) "no"</remarks>
         public const string MIAKey = "mia";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string; ArchiveDotOrg.File</remarks>
         public const string TesseractOCRKey = "ocr";
 
diff --git a/SabreTools.Data.Models/Metadata/Sample.cs b/SabreTools.Data.Models/Metadata/Sample.cs
index 63ec55ec..3570b3aa 100644
--- a/SabreTools.Data.Models/Metadata/Sample.cs
+++ b/SabreTools.Data.Models/Metadata/Sample.cs
@@ -12,13 +12,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #endregion
 
-        #region Keys
-
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
-        #endregion
-
         public Sample() => ItemType = ItemType.Sample;
     }
 }
diff --git a/SabreTools.Data.Models/Metadata/SharedFeat.cs b/SabreTools.Data.Models/Metadata/SharedFeat.cs
index 524848dc..86df3931 100644
--- a/SabreTools.Data.Models/Metadata/SharedFeat.cs
+++ b/SabreTools.Data.Models/Metadata/SharedFeat.cs
@@ -14,9 +14,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #region Keys
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string ValueKey = "value";
 
diff --git a/SabreTools.Data.Models/Metadata/Slot.cs b/SabreTools.Data.Models/Metadata/Slot.cs
index 3b57cbf7..5eb79f6a 100644
--- a/SabreTools.Data.Models/Metadata/Slot.cs
+++ b/SabreTools.Data.Models/Metadata/Slot.cs
@@ -14,9 +14,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #region Keys
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>SlotOption[]</remarks>
         [NoFilter]
         public const string SlotOptionKey = "slotoption";
diff --git a/SabreTools.Data.Models/Metadata/SlotOption.cs b/SabreTools.Data.Models/Metadata/SlotOption.cs
index 829b9bcd..ff84c17d 100644
--- a/SabreTools.Data.Models/Metadata/SlotOption.cs
+++ b/SabreTools.Data.Models/Metadata/SlotOption.cs
@@ -20,9 +20,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string DevNameKey = "devname";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         #endregion
 
         public SlotOption() => ItemType = ItemType.SlotOption;
diff --git a/SabreTools.Data.Models/Metadata/Software.cs b/SabreTools.Data.Models/Metadata/Software.cs
index 9e1450f0..18e67e4d 100644
--- a/SabreTools.Data.Models/Metadata/Software.cs
+++ b/SabreTools.Data.Models/Metadata/Software.cs
@@ -24,9 +24,6 @@ namespace SabreTools.Data.Models.Metadata
         [NoFilter]
         public const string InfoKey = "info";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string NotesKey = "notes";
 
diff --git a/SabreTools.Data.Models/Metadata/SoftwareList.cs b/SabreTools.Data.Models/Metadata/SoftwareList.cs
index ac6a912f..8b51bb32 100644
--- a/SabreTools.Data.Models/Metadata/SoftwareList.cs
+++ b/SabreTools.Data.Models/Metadata/SoftwareList.cs
@@ -20,9 +20,6 @@ namespace SabreTools.Data.Models.Metadata
         /// <remarks>string</remarks>
         public const string FilterKey = "filter";
 
-        /// <remarks>string</remarks>
-        public const string NameKey = "name";
-
         /// <remarks>string</remarks>
         public const string NotesKey = "notes";
 
diff --git a/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs b/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
index 9d32691a..5981ecc4 100644
--- a/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
@@ -56,7 +56,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
             ]));
         }
 
@@ -96,7 +96,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Release.NameKey,
+                nameof(Data.Models.Metadata.Release.Name),
                 Data.Models.Metadata.Release.RegionKey,
             ]));
         }
@@ -111,7 +111,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.BiosSet.NameKey,
+                nameof(Data.Models.Metadata.BiosSet.Name),
                 Data.Models.Metadata.BiosSet.DescriptionKey,
             ]));
         }
@@ -126,7 +126,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
@@ -142,7 +142,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -157,7 +157,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Sample.NameKey,
+                nameof(Data.Models.Metadata.Sample.Name),
             ]));
         }
 
@@ -171,7 +171,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Archive.NameKey,
+                nameof(Data.Models.Metadata.Archive.Name),
             ]));
         }
 
@@ -186,7 +186,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
                 Data.Models.Metadata.Chip.ChipTypeKey,
-                Data.Models.Metadata.Chip.NameKey,
+                nameof(Data.Models.Metadata.Chip.Name),
             ]));
         }
 
@@ -244,7 +244,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.DipSwitch.NameKey,
+                nameof(Data.Models.Metadata.DipSwitch.Name),
             ]));
         }
 
@@ -287,7 +287,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.CRCKey,
             ]));
@@ -317,7 +317,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SHA256Key,
                 Data.Models.Metadata.Rom.SHA1Key,
                 Data.Models.Metadata.Rom.MD5Key,
@@ -349,7 +349,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.CRCKey,
             ]));
         }
@@ -374,7 +374,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.MD2Key,
             ]));
         }
@@ -399,7 +399,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.MD4Key,
             ]));
         }
@@ -426,7 +426,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.MD5Key,
             ]));
         }
@@ -441,7 +441,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.MD5Key,
             ]));
         }
@@ -456,7 +456,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.MD5Key,
             ]));
         }
@@ -481,7 +481,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.RIPEMD128Key,
             ]));
         }
@@ -506,7 +506,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.RIPEMD160Key,
             ]));
         }
@@ -533,7 +533,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -548,7 +548,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.SHA1Key,
             ]));
         }
@@ -563,7 +563,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
         }
@@ -589,7 +589,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.SHA256Key,
             ]));
         }
@@ -604,7 +604,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SHA256Key,
             ]));
         }
@@ -629,7 +629,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SHA384Key,
             ]));
         }
@@ -654,7 +654,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SHA512Key,
             ]));
         }
@@ -680,7 +680,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.SpamSumKey,
             ]));
         }
@@ -695,7 +695,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SpamSumKey,
             ]));
         }
@@ -725,7 +725,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -740,7 +740,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.CRCKey,
                 Data.Models.Metadata.Rom.SHA1Key,
@@ -790,7 +790,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.BiosSet.NameKey,
+                nameof(Data.Models.Metadata.BiosSet.Name),
                 Data.Models.Metadata.BiosSet.DescriptionKey,
             ]));
         }
@@ -805,7 +805,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
@@ -821,7 +821,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -836,7 +836,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.DeviceRef.NameKey,
+                nameof(Data.Models.Metadata.DeviceRef.Name),
             ]));
         }
 
@@ -850,7 +850,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Sample.NameKey,
+                nameof(Data.Models.Metadata.Sample.Name),
             ]));
         }
 
@@ -864,7 +864,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Chip.NameKey,
+                nameof(Data.Models.Metadata.Chip.Name),
                 Data.Models.Metadata.Chip.ChipTypeKey,
             ]));
         }
@@ -922,7 +922,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.DipSwitch.NameKey,
+                nameof(Data.Models.Metadata.DipSwitch.Name),
                 Data.Models.Metadata.DipSwitch.TagKey,
             ]));
         }
@@ -937,7 +937,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Configuration.NameKey,
+                nameof(Data.Models.Metadata.Configuration.Name),
                 Data.Models.Metadata.Configuration.TagKey,
             ]));
         }
@@ -966,7 +966,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Adjuster.NameKey,
+                nameof(Data.Models.Metadata.Adjuster.Name),
             ]));
         }
 
@@ -1025,7 +1025,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Slot.NameKey,
+                nameof(Data.Models.Metadata.Slot.Name),
             ]));
         }
 
@@ -1040,7 +1040,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
                 Data.Models.Metadata.SoftwareList.TagKey,
-                Data.Models.Metadata.SoftwareList.NameKey,
+                nameof(Data.Models.Metadata.SoftwareList.Name),
                 Data.Models.Metadata.SoftwareList.StatusKey,
             ]));
         }
@@ -1055,7 +1055,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.RamOption.NameKey,
+                nameof(Data.Models.Metadata.RamOption.Name),
             ]));
         }
 
@@ -1092,7 +1092,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Release.NameKey,
+                nameof(Data.Models.Metadata.Release.Name),
                 Data.Models.Metadata.Release.RegionKey,
             ]));
         }
@@ -1107,7 +1107,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.BiosSet.NameKey,
+                nameof(Data.Models.Metadata.BiosSet.Name),
                 Data.Models.Metadata.BiosSet.DescriptionKey,
             ]));
         }
@@ -1122,7 +1122,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
@@ -1138,7 +1138,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -1153,7 +1153,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.SHA1Key,
             ]));
         }
@@ -1168,7 +1168,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.DeviceRef.NameKey,
+                nameof(Data.Models.Metadata.DeviceRef.Name),
             ]));
         }
 
@@ -1182,7 +1182,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Sample.NameKey,
+                nameof(Data.Models.Metadata.Sample.Name),
             ]));
         }
 
@@ -1196,7 +1196,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Archive.NameKey,
+                nameof(Data.Models.Metadata.Archive.Name),
             ]));
         }
 
@@ -1228,7 +1228,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
                 Data.Models.Metadata.SoftwareList.TagKey,
-                Data.Models.Metadata.SoftwareList.NameKey,
+                nameof(Data.Models.Metadata.SoftwareList.Name),
                 Data.Models.Metadata.SoftwareList.StatusKey,
             ]));
         }
@@ -1305,7 +1305,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
         }
@@ -1334,7 +1334,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.CRCKey,
                 Data.Models.Metadata.Rom.SizeKey,
             ]));
@@ -1390,7 +1390,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -1405,7 +1405,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.SHA1Key,
             ]));
         }
@@ -1420,7 +1420,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
@@ -1448,7 +1448,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -1463,7 +1463,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.SHA1Key,
             ]));
         }
@@ -1478,7 +1478,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
@@ -1506,7 +1506,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.Disk.Name),
                 Data.Models.Metadata.Disk.SHA1Key,
             ]));
         }
@@ -1521,7 +1521,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Media.NameKey,
+                nameof(Data.Models.Metadata.Media.Name),
                 Data.Models.Metadata.Media.SHA1Key,
             ]));
         }
@@ -1536,7 +1536,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Rom.NameKey,
+                nameof(Data.Models.Metadata.Rom.Name),
                 Data.Models.Metadata.Rom.SizeKey,
                 Data.Models.Metadata.Rom.SHA1Key,
             ]));
@@ -1571,9 +1571,9 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Part.NameKey,
+                nameof(Data.Models.Metadata.Part.Name),
                 Data.Models.Metadata.Part.InterfaceKey,
-                Data.Models.Metadata.DipSwitch.NameKey,
+                nameof(Data.Models.Metadata.DipSwitch.Name),
                 Data.Models.Metadata.DipSwitch.TagKey,
                 Data.Models.Metadata.DipSwitch.MaskKey,
             ]));
@@ -1589,10 +1589,10 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Part.NameKey,
+                nameof(Data.Models.Metadata.Part.Name),
                 Data.Models.Metadata.Part.InterfaceKey,
-                Data.Models.Metadata.DiskArea.NameKey,
-                Data.Models.Metadata.Disk.NameKey,
+                nameof(Data.Models.Metadata.DiskArea.Name),
+                nameof(Data.Models.Metadata.Disk.Name),
             ]));
         }
 
@@ -1606,7 +1606,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Info.NameKey,
+                nameof(Data.Models.Metadata.Info.Name),
             ]));
         }
 
@@ -1620,9 +1620,9 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.Part.NameKey,
+                nameof(Data.Models.Metadata.Part.Name),
                 Data.Models.Metadata.Part.InterfaceKey,
-                Data.Models.Metadata.DataArea.NameKey,
+                nameof(Data.Models.Metadata.DataArea.Name),
                 Data.Models.Metadata.DataArea.SizeKey,
             ]));
         }
@@ -1637,7 +1637,7 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Assert.NotNull(actual);
             Assert.True(actual.SequenceEqual([
-                Data.Models.Metadata.SharedFeat.NameKey,
+                nameof(Data.Models.Metadata.SharedFeat.Name),
             ]));
         }
 
diff --git a/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs b/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs
index 68f24059..8861f40f 100644
--- a/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using SabreTools.Metadata.DatItems;
 
 namespace SabreTools.Metadata.DatFiles.Formats
@@ -30,7 +30,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             return missingFields;
         }
diff --git a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
index 7ecd1379..7c644f29 100644
--- a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
@@ -76,21 +76,21 @@ namespace SabreTools.Metadata.DatFiles.Formats
             {
                 case Release release:
                     if (string.IsNullOrEmpty(release.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Release.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Release.Name));
                     if (string.IsNullOrEmpty(release.ReadString(Data.Models.Metadata.Release.RegionKey)))
                         missingFields.Add(Data.Models.Metadata.Release.RegionKey);
                     break;
 
                 case BiosSet biosset:
                     if (string.IsNullOrEmpty(biosset.GetName()))
-                        missingFields.Add(Data.Models.Metadata.BiosSet.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Name));
                     if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)))
                         missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey);
                     break;
 
                 case Rom rom:
                     if (string.IsNullOrEmpty(rom.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
                         missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
                     if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key))
@@ -114,7 +114,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case Disk disk:
                     if (string.IsNullOrEmpty(disk.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Disk.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
                         && string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
                     {
@@ -125,19 +125,19 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case Sample sample:
                     if (string.IsNullOrEmpty(sample.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Sample.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Sample.Name));
                     break;
 
                 case Archive archive:
                     if (string.IsNullOrEmpty(archive.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Archive.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Archive.Name));
                     break;
 
                 case Chip chip:
                     if (chip.ReadString(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType() is null)
                         missingFields.Add(Data.Models.Metadata.Chip.ChipTypeKey);
                     if (string.IsNullOrEmpty(chip.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Chip.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Chip.Name));
                     break;
 
                 case Display display:
@@ -161,7 +161,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case DipSwitch dipswitch:
                     if (string.IsNullOrEmpty(dipswitch.GetName()))
-                        missingFields.Add(Data.Models.Metadata.DipSwitch.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Name));
                     break;
 
                 case Driver driver:
diff --git a/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs b/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
index f008a551..3a37381c 100644
--- a/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
@@ -31,7 +31,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs b/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
index 03f88f7a..f6efbec2 100644
--- a/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
@@ -31,7 +31,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Listrom.cs b/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
index 234f9723..bfba39fa 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
@@ -32,7 +32,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
index da230117..76b6a78b 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
@@ -262,14 +262,14 @@ namespace SabreTools.Metadata.DatFiles.Formats
             {
                 case BiosSet biosset:
                     if (string.IsNullOrEmpty(biosset.GetName()))
-                        missingFields.Add(Data.Models.Metadata.BiosSet.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Name));
                     if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)))
                         missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey);
                     break;
 
                 case Rom rom:
                     if (string.IsNullOrEmpty(rom.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
                         missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
                     if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey))
@@ -282,7 +282,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case Disk disk:
                     if (string.IsNullOrEmpty(disk.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Disk.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
                         && string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
                     {
@@ -293,17 +293,17 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case DeviceRef deviceref:
                     if (string.IsNullOrEmpty(deviceref.GetName()))
-                        missingFields.Add(Data.Models.Metadata.DeviceRef.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.DeviceRef.Name));
                     break;
 
                 case Sample sample:
                     if (string.IsNullOrEmpty(sample.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Sample.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Sample.Name));
                     break;
 
                 case Chip chip:
                     if (string.IsNullOrEmpty(chip.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Chip.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Chip.Name));
                     if (chip.ReadString(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType() is null)
                         missingFields.Add(Data.Models.Metadata.Chip.ChipTypeKey);
                     break;
@@ -327,14 +327,14 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case DipSwitch dipswitch:
                     if (string.IsNullOrEmpty(dipswitch.GetName()))
-                        missingFields.Add(Data.Models.Metadata.DipSwitch.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Name));
                     if (string.IsNullOrEmpty(dipswitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)))
                         missingFields.Add(Data.Models.Metadata.DipSwitch.TagKey);
                     break;
 
                 case Configuration configuration:
                     if (string.IsNullOrEmpty(configuration.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Configuration.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Configuration.Name));
                     if (string.IsNullOrEmpty(configuration.ReadString(Data.Models.Metadata.Configuration.TagKey)))
                         missingFields.Add(Data.Models.Metadata.Configuration.TagKey);
                     break;
@@ -346,7 +346,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case Adjuster adjuster:
                     if (string.IsNullOrEmpty(adjuster.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Adjuster.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Adjuster.Name));
                     break;
 
                 case Driver driver:
@@ -372,21 +372,21 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case Slot slot:
                     if (string.IsNullOrEmpty(slot.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Slot.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Slot.Name));
                     break;
 
                 case DatItems.Formats.SoftwareList softwarelist:
                     if (string.IsNullOrEmpty(softwarelist.ReadString(Data.Models.Metadata.SoftwareList.TagKey)))
                         missingFields.Add(Data.Models.Metadata.SoftwareList.TagKey);
                     if (string.IsNullOrEmpty(softwarelist.GetName()))
-                        missingFields.Add(Data.Models.Metadata.SoftwareList.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.SoftwareList.Name));
                     if (softwarelist.ReadString(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus() == null)
                         missingFields.Add(Data.Models.Metadata.SoftwareList.StatusKey);
                     break;
 
                 case RamOption ramoption:
                     if (string.IsNullOrEmpty(ramoption.GetName()))
-                        missingFields.Add(Data.Models.Metadata.RamOption.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.RamOption.Name));
                     break;
 
                 default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
index 59113dbe..48c8b7f5 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
@@ -268,21 +268,21 @@ namespace SabreTools.Metadata.DatFiles.Formats
             {
                 case Release release:
                     if (string.IsNullOrEmpty(release.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Release.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Release.Name));
                     if (string.IsNullOrEmpty(release.ReadString(Data.Models.Metadata.Release.RegionKey)))
                         missingFields.Add(Data.Models.Metadata.Release.RegionKey);
                     break;
 
                 case BiosSet biosset:
                     if (string.IsNullOrEmpty(biosset.GetName()))
-                        missingFields.Add(Data.Models.Metadata.BiosSet.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Name));
                     if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)))
                         missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey);
                     break;
 
                 case Rom rom:
                     if (string.IsNullOrEmpty(rom.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
                         missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
                     if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key))
@@ -306,7 +306,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case Disk disk:
                     if (string.IsNullOrEmpty(disk.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Disk.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
                         && string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
                     {
@@ -317,7 +317,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case Media media:
                     if (string.IsNullOrEmpty(media.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Media.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Media.Name));
                     if (string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.MD5Key))
                         && string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA1Key))
                         && string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA256Key))
@@ -330,17 +330,17 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case DeviceRef deviceref:
                     if (string.IsNullOrEmpty(deviceref.GetName()))
-                        missingFields.Add(Data.Models.Metadata.DeviceRef.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.DeviceRef.Name));
                     break;
 
                 case Sample sample:
                     if (string.IsNullOrEmpty(sample.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Sample.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Sample.Name));
                     break;
 
                 case Archive archive:
                     if (string.IsNullOrEmpty(archive.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Archive.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Archive.Name));
                     break;
 
                 case Driver driver:
@@ -358,7 +358,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
                     if (string.IsNullOrEmpty(softwarelist.ReadString(Data.Models.Metadata.SoftwareList.TagKey)))
                         missingFields.Add(Data.Models.Metadata.SoftwareList.TagKey);
                     if (string.IsNullOrEmpty(softwarelist.GetName()))
-                        missingFields.Add(Data.Models.Metadata.SoftwareList.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.SoftwareList.Name));
                     if (softwarelist.ReadString(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus() == null)
                         missingFields.Add(Data.Models.Metadata.SoftwareList.StatusKey);
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md2File.cs b/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
index 2ac078f0..10c5d283 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
@@ -33,7 +33,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md4File.cs b/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
index 344bab1b..3365a09f 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
@@ -33,7 +33,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md5File.cs b/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
index 81a9e1b5..c72f9502 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
index cc0ed775..c062b863 100644
--- a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
@@ -70,7 +70,7 @@ The softwaredb.xml file contains information about rom mapper types
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs b/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
index 3eaa2ac0..4cadad6d 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
@@ -33,7 +33,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs b/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
index 44dcdf7a..641ad2b2 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
@@ -33,7 +33,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs b/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
index 06da3fb8..926b409f 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
@@ -31,7 +31,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
index 86ccd46a..4345d918 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
@@ -68,7 +68,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs b/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
index 9a16b416..c2c7f122 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
@@ -33,7 +33,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
index 00891709..f1fe3be2 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
index a0d90e3a..67bb2468 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
@@ -34,7 +34,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
index 1b165af9..9471cdb2 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
@@ -33,7 +33,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
index 0428d0d2..cb0fdc92 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
@@ -33,7 +33,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs b/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs
index 66db7703..c7488661 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs
@@ -109,19 +109,19 @@ namespace SabreTools.Metadata.DatFiles.Formats
                 case DipSwitch dipSwitch:
                     if (!dipSwitch.PartSpecified)
                     {
-                        missingFields.Add(Data.Models.Metadata.Part.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Part.Name));
                         missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
                     }
                     else
                     {
                         if (string.IsNullOrEmpty(dipSwitch.Read<Part?>(DipSwitch.PartKey)!.GetName()))
-                            missingFields.Add(Data.Models.Metadata.Part.NameKey);
+                            missingFields.Add(nameof(Data.Models.Metadata.Part.Name));
                         if (string.IsNullOrEmpty(dipSwitch.Read<Part?>(DipSwitch.PartKey)!.ReadString(Data.Models.Metadata.Part.InterfaceKey)))
                             missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
                     }
 
                     if (string.IsNullOrEmpty(dipSwitch.GetName()))
-                        missingFields.Add(Data.Models.Metadata.DipSwitch.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Name));
                     if (string.IsNullOrEmpty(dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)))
                         missingFields.Add(Data.Models.Metadata.DipSwitch.TagKey);
                     if (string.IsNullOrEmpty(dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.MaskKey)))
@@ -130,7 +130,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
                     {
                         var dipValues = dipSwitch.Read<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey);
                         if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.GetName())) is not null)
-                            missingFields.Add(Data.Models.Metadata.DipValue.NameKey);
+                            missingFields.Add(nameof(Data.Models.Metadata.DipValue.Name));
                         if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.ReadString(Data.Models.Metadata.DipValue.ValueKey))) is not null)
                             missingFields.Add(Data.Models.Metadata.DipValue.ValueKey);
                     }
@@ -140,59 +140,59 @@ namespace SabreTools.Metadata.DatFiles.Formats
                 case Disk disk:
                     if (!disk.PartSpecified)
                     {
-                        missingFields.Add(Data.Models.Metadata.Part.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Part.Name));
                         missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
                     }
                     else
                     {
                         if (string.IsNullOrEmpty(disk.Read<Part?>(Disk.PartKey)!.GetName()))
-                            missingFields.Add(Data.Models.Metadata.Part.NameKey);
+                            missingFields.Add(nameof(Data.Models.Metadata.Part.Name));
                         if (string.IsNullOrEmpty(disk.Read<Part?>(Disk.PartKey)!.ReadString(Data.Models.Metadata.Part.InterfaceKey)))
                             missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
                     }
 
                     if (!disk.DiskAreaSpecified)
                     {
-                        missingFields.Add(Data.Models.Metadata.DiskArea.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.DiskArea.Name));
                     }
                     else
                     {
                         if (string.IsNullOrEmpty(disk.Read<DiskArea?>(Disk.DiskAreaKey)!.GetName()))
-                            missingFields.Add(Data.Models.Metadata.DiskArea.NameKey);
+                            missingFields.Add(nameof(Data.Models.Metadata.DiskArea.Name));
                     }
 
                     if (string.IsNullOrEmpty(disk.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Disk.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     break;
 
                 case Info info:
                     if (string.IsNullOrEmpty(info.GetName()))
-                        missingFields.Add(Data.Models.Metadata.Info.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Info.Name));
                     break;
 
                 case Rom rom:
                     if (!rom.PartSpecified)
                     {
-                        missingFields.Add(Data.Models.Metadata.Part.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.Part.Name));
                         missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
                     }
                     else
                     {
                         if (string.IsNullOrEmpty(rom.Read<Part?>(Rom.PartKey)!.GetName()))
-                            missingFields.Add(Data.Models.Metadata.Part.NameKey);
+                            missingFields.Add(nameof(Data.Models.Metadata.Part.Name));
                         if (string.IsNullOrEmpty(rom.Read<Part?>(Rom.PartKey)!.ReadString(Data.Models.Metadata.Part.InterfaceKey)))
                             missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
                     }
 
                     if (!rom.DataAreaSpecified)
                     {
-                        missingFields.Add(Data.Models.Metadata.DataArea.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.DataArea.Name));
                         missingFields.Add(Data.Models.Metadata.DataArea.SizeKey);
                     }
                     else
                     {
                         if (string.IsNullOrEmpty(rom.Read<DataArea?>(Rom.DataAreaKey)!.GetName()))
-                            missingFields.Add(Data.Models.Metadata.DataArea.NameKey);
+                            missingFields.Add(nameof(Data.Models.Metadata.DataArea.Name));
                         if (rom.Read<DataArea?>(Rom.DataAreaKey)!.ReadLong(Data.Models.Metadata.DataArea.SizeKey) is null)
                             missingFields.Add(Data.Models.Metadata.DataArea.SizeKey);
                     }
@@ -201,7 +201,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                 case SharedFeat sharedFeat:
                     if (string.IsNullOrEmpty(sharedFeat.GetName()))
-                        missingFields.Add(Data.Models.Metadata.SharedFeat.NameKey);
+                        missingFields.Add(nameof(Data.Models.Metadata.SharedFeat.Name));
                     break;
 
                 default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs b/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
index 1ead5e31..b418d944 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
@@ -34,7 +34,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
             // Check item name
             if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(Data.Models.Metadata.Rom.NameKey);
+                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
 
             switch (datItem)
             {
diff --git a/SabreTools.Metadata.Filter/FilterKey.cs b/SabreTools.Metadata.Filter/FilterKey.cs
index 8419635b..887e5944 100644
--- a/SabreTools.Metadata.Filter/FilterKey.cs
+++ b/SabreTools.Metadata.Filter/FilterKey.cs
@@ -106,6 +106,14 @@ namespace SabreTools.Metadata.Filter
             if (constants is null)
                 return false;
 
+            // Special cases
+            if (fieldName.Equals("name", StringComparison.OrdinalIgnoreCase))
+            {
+                itemName = MetadataFile.HeaderKey;
+                fieldName = "name";
+                return true;
+            }
+
             // Get if there's a match to the constant
             string localFieldName = fieldName;
             string? constantMatch = Array.Find(constants, c => string.Equals(c, localFieldName, StringComparison.OrdinalIgnoreCase));
@@ -128,6 +136,14 @@ namespace SabreTools.Metadata.Filter
             if (constants is null)
                 return false;
 
+            // Special cases
+            if (fieldName.Equals("name", StringComparison.OrdinalIgnoreCase))
+            {
+                itemName = MetadataFile.MachineKey;
+                fieldName = "name";
+                return true;
+            }
+
             // Get if there's a match to the constant
             string localFieldName = fieldName;
             string? constantMatch = Array.Find(constants, c => string.Equals(c, localFieldName, StringComparison.OrdinalIgnoreCase));
@@ -149,6 +165,14 @@ namespace SabreTools.Metadata.Filter
             if (string.Equals(itemName, "datitem", StringComparison.OrdinalIgnoreCase)
                 || string.Equals(itemName, "item", StringComparison.OrdinalIgnoreCase))
             {
+                // Special cases
+                if (fieldName.Equals("name", StringComparison.OrdinalIgnoreCase))
+                {
+                    itemName = "item";
+                    fieldName = "name";
+                    return true;
+                }
+
                 // Get all item types
                 var itemTypes = TypeHelper.GetDatItemTypeNames();
 
@@ -204,6 +228,10 @@ namespace SabreTools.Metadata.Filter
             if (constants is null)
                 return null;
 
+            // Special cases
+            if (fieldName.Equals("name", StringComparison.OrdinalIgnoreCase))
+                return "name";
+
             // Get if there's a match to the constant
             string localFieldName = fieldName;
             string? constantMatch = Array.Find(constants, c => string.Equals(c, localFieldName, StringComparison.OrdinalIgnoreCase));