diff --git a/SabreTools.Core/DictionaryBaseExtensions.cs b/SabreTools.Core/DictionaryBaseExtensions.cs
index f52d1a54..7af53f6a 100644
--- a/SabreTools.Core/DictionaryBaseExtensions.cs
+++ b/SabreTools.Core/DictionaryBaseExtensions.cs
@@ -8,21 +8,131 @@ namespace SabreTools.Core
 {
     public static class DictionaryBaseExtensions
     {
+        #region Accessors
+
+        /// <summary>
+        /// Gets the name to use for a DictionaryBase or null
+        /// </summary>
+        public static string? GetName(this DictionaryBase self)
+        {
+            if (self == null)
+                return null;
+
+            return self switch
+            {
+                Machine => self.ReadString(Machine.NameKey),
+
+                Adjuster => self.ReadString(Adjuster.NameKey),
+                Analog => null,
+                Archive => self.ReadString(Archive.NameKey),
+                BiosSet => self.ReadString(BiosSet.NameKey),
+                Chip => self.ReadString(Chip.NameKey),
+                Condition => null,
+                ConfLocation => self.ReadString(ConfLocation.NameKey),
+                ConfSetting => self.ReadString(ConfSetting.NameKey),
+                Configuration => self.ReadString(Configuration.NameKey),
+                Control => null,
+                DataArea => self.ReadString(DataArea.NameKey),
+                Device => null,
+                DeviceRef => self.ReadString(DeviceRef.NameKey),
+                DipLocation => self.ReadString(DipLocation.NameKey),
+                DipSwitch => self.ReadString(DipSwitch.NameKey),
+                DipValue => self.ReadString(DipValue.NameKey),
+                Disk => self.ReadString(Disk.NameKey),
+                DiskArea => self.ReadString(DiskArea.NameKey),
+                Display => null,
+                Driver => null,
+                Extension => self.ReadString(Extension.NameKey),
+                Feature => self.ReadString(Feature.NameKey),
+                Info => self.ReadString(Info.NameKey),
+                Input => null,
+                Instance => self.ReadString(Instance.NameKey),
+                Media => self.ReadString(Media.NameKey),
+                Part => self.ReadString(Part.NameKey),
+                Port => null,
+                RamOption => self.ReadString(RamOption.NameKey),
+                Release => self.ReadString(Release.NameKey),
+                Rom => self.ReadString(Rom.NameKey),
+                Sample => self.ReadString(Sample.NameKey),
+                SharedFeat => self.ReadString(SharedFeat.NameKey),
+                Slot => self.ReadString(Slot.NameKey),
+                SlotOption => self.ReadString(SlotOption.NameKey),
+                SoftwareList => self.ReadString(SoftwareList.NameKey),
+                Sound => null,
+
+                _ => null,
+            };
+        }
+
+        /// <summary>
+        /// Gets the name to use for a DictionaryBase or null
+        /// </summary>
+        public static void SetName(this DictionaryBase self, string? name)
+        {
+            if (self == null || string.IsNullOrEmpty(name))
+                return;
+
+            switch (self)
+            {
+                case Machine: self[Machine.NameKey] = name; break;
+
+                case Adjuster: self[Adjuster.NameKey] = name; break;
+                case Analog: break;
+                case Archive: self[Archive.NameKey] = name; break;
+                case BiosSet: self[BiosSet.NameKey] = name; break;
+                case Chip: self[Chip.NameKey] = name; break;
+                case Condition: break;
+                case ConfLocation: self[ConfLocation.NameKey] = name; break;
+                case ConfSetting: self[ConfSetting.NameKey] = name; break;
+                case Configuration: self[Configuration.NameKey] = name; break;
+                case Control: break;
+                case DataArea: self[DataArea.NameKey] = name; break;
+                case Device: break;
+                case DeviceRef: self[DeviceRef.NameKey] = name; break;
+                case DipLocation: self[DipLocation.NameKey] = name; break;
+                case DipSwitch: self[DipSwitch.NameKey] = name; break;
+                case DipValue: self[DipValue.NameKey] = name; break;
+                case Disk: self[Disk.NameKey] = name; break;
+                case DiskArea: self[DiskArea.NameKey] = name; break;
+                case Display: break;
+                case Driver: break;
+                case Extension: self[Extension.NameKey] = name; break;
+                case Feature: self[Feature.NameKey] = name; break;
+                case Info: self[Info.NameKey] = name; break;
+                case Input: break;
+                case Instance: self[Instance.NameKey] = name; break;
+                case Media: self[Media.NameKey] = name; break;
+                case Part: self[Part.NameKey] = name; break;
+                case Port: break;
+                case RamOption: self[RamOption.NameKey] = name; break;
+                case Release: self[Release.NameKey] = name; break;
+                case Rom: self[Rom.NameKey] = name; break;
+                case Sample: self[Sample.NameKey] = name; break;
+                case SharedFeat: self[SharedFeat.NameKey] = name; break;
+                case Slot: self[Slot.NameKey] = name; break;
+                case SlotOption: self[SlotOption.NameKey] = name; break;
+                case SoftwareList: self[SoftwareList.NameKey] = name; break;
+                case Sound: break;
+            }
+        }
+
+        #endregion
+
         #region Cloning
 
         /// <summary>
         /// Deep clone a DictionaryBase object
         /// </summary>
-        public static DictionaryBase? Clone(this DictionaryBase dictionaryBase)
+        public static DictionaryBase? Clone(this DictionaryBase self)
         {
             // If construction failed, we can't do anything
-            if (Activator.CreateInstance(dictionaryBase.GetType()) is not DictionaryBase clone)
+            if (Activator.CreateInstance(self.GetType()) is not DictionaryBase clone)
                 return null;
 
             // Loop through and clone per type
-            foreach (string key in dictionaryBase.Keys)
+            foreach (string key in self.Keys)
             {
-                object? value = dictionaryBase[key];
+                object? value = self[key];
                 clone[key] = value switch
                 {
                     // Primative types
diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs
index f63dfd1c..5b03472d 100644
--- a/SabreTools.DatItems/DatItem.cs
+++ b/SabreTools.DatItems/DatItem.cs
@@ -520,15 +520,6 @@ namespace SabreTools.DatItems
     /// </summary>
     public abstract class DatItem<T> : DatItem, IEquatable<DatItem<T>>, IComparable<DatItem<T>>, ICloneable where T : Models.Metadata.DatItem
     {
-        #region Fields
-
-        /// <summary>
-        /// Key for accessing the item name, if it exists
-        /// </summary>
-        protected abstract string? NameKey { get; }
-
-        #endregion
-
         #region Constructors
 
         /// <summary>
@@ -559,20 +550,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string? GetName()
-        {
-            if (!string.IsNullOrEmpty(NameKey))
-                return GetStringFieldValue(NameKey);
-
-            return null;
-        }
+        public override string? GetName() => _internal.GetName();
 
         /// <inheritdoc/>
-        public override void SetName(string? name)
-        {
-            if (!string.IsNullOrEmpty(NameKey))
-                SetFieldValue(NameKey, name);
-        }
+        public override void SetName(string? name) => _internal.SetName(name);
 
         #endregion
 
diff --git a/SabreTools.DatItems/Formats/Adjuster.cs b/SabreTools.DatItems/Formats/Adjuster.cs
index 92576a13..9ff7a2b0 100644
--- a/SabreTools.DatItems/Formats/Adjuster.cs
+++ b/SabreTools.DatItems/Formats/Adjuster.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Adjuster;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Adjuster.NameKey;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/Analog.cs b/SabreTools.DatItems/Formats/Analog.cs
index c9fd5fb6..b60eb3bd 100644
--- a/SabreTools.DatItems/Formats/Analog.cs
+++ b/SabreTools.DatItems/Formats/Analog.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Analog;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Archive.cs b/SabreTools.DatItems/Formats/Archive.cs
index b967e7ee..5dc411be 100644
--- a/SabreTools.DatItems/Formats/Archive.cs
+++ b/SabreTools.DatItems/Formats/Archive.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Archive;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Archive.NameKey;
-
         // TODO: None of the following are used or checked
 
         /// <summary>
diff --git a/SabreTools.DatItems/Formats/BiosSet.cs b/SabreTools.DatItems/Formats/BiosSet.cs
index 3a01c2fb..eb63e7ec 100644
--- a/SabreTools.DatItems/Formats/BiosSet.cs
+++ b/SabreTools.DatItems/Formats/BiosSet.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.BiosSet;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.BiosSet.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Chip.cs b/SabreTools.DatItems/Formats/Chip.cs
index 99e66228..ed185849 100644
--- a/SabreTools.DatItems/Formats/Chip.cs
+++ b/SabreTools.DatItems/Formats/Chip.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Chip;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Chip.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Condition.cs b/SabreTools.DatItems/Formats/Condition.cs
index 618ced62..c24ff9a2 100644
--- a/SabreTools.DatItems/Formats/Condition.cs
+++ b/SabreTools.DatItems/Formats/Condition.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Condition;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/ConfLocation.cs b/SabreTools.DatItems/Formats/ConfLocation.cs
index 3d6914cc..8dfa2130 100644
--- a/SabreTools.DatItems/Formats/ConfLocation.cs
+++ b/SabreTools.DatItems/Formats/ConfLocation.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.ConfLocation;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.ConfLocation.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/ConfSetting.cs b/SabreTools.DatItems/Formats/ConfSetting.cs
index e6a07d18..3b4163cc 100644
--- a/SabreTools.DatItems/Formats/ConfSetting.cs
+++ b/SabreTools.DatItems/Formats/ConfSetting.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.ConfSetting;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.ConfSetting.NameKey;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/Configuration.cs b/SabreTools.DatItems/Formats/Configuration.cs
index 29a39b1e..0c945fa4 100644
--- a/SabreTools.DatItems/Formats/Configuration.cs
+++ b/SabreTools.DatItems/Formats/Configuration.cs
@@ -16,9 +16,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Configuration;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Configuration.NameKey;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/Control.cs b/SabreTools.DatItems/Formats/Control.cs
index e2ca2819..3eec2ba3 100644
--- a/SabreTools.DatItems/Formats/Control.cs
+++ b/SabreTools.DatItems/Formats/Control.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Control;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/DataArea.cs b/SabreTools.DatItems/Formats/DataArea.cs
index 7121cd4e..2975dcc3 100644
--- a/SabreTools.DatItems/Formats/DataArea.cs
+++ b/SabreTools.DatItems/Formats/DataArea.cs
@@ -16,9 +16,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.DataArea;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.DataArea.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Device.cs b/SabreTools.DatItems/Formats/Device.cs
index 75a60ee6..3ebe54dd 100644
--- a/SabreTools.DatItems/Formats/Device.cs
+++ b/SabreTools.DatItems/Formats/Device.cs
@@ -17,9 +17,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Device;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         [JsonIgnore]
         public bool InstancesSpecified
         {
diff --git a/SabreTools.DatItems/Formats/DeviceRef.cs b/SabreTools.DatItems/Formats/DeviceRef.cs
index 9e1ccb2c..ab1bce2a 100644
--- a/SabreTools.DatItems/Formats/DeviceRef.cs
+++ b/SabreTools.DatItems/Formats/DeviceRef.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.DeviceRef;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.DeviceRef.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/DipLocation.cs b/SabreTools.DatItems/Formats/DipLocation.cs
index f9cbc9f0..6e0e4892 100644
--- a/SabreTools.DatItems/Formats/DipLocation.cs
+++ b/SabreTools.DatItems/Formats/DipLocation.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.DipLocation;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.DipLocation.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/DipSwitch.cs b/SabreTools.DatItems/Formats/DipSwitch.cs
index 0e9406b8..f81a9160 100644
--- a/SabreTools.DatItems/Formats/DipSwitch.cs
+++ b/SabreTools.DatItems/Formats/DipSwitch.cs
@@ -26,9 +26,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.DipSwitch;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.DipSwitch.NameKey;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/DipValue.cs b/SabreTools.DatItems/Formats/DipValue.cs
index 7a130152..b10f0eaa 100644
--- a/SabreTools.DatItems/Formats/DipValue.cs
+++ b/SabreTools.DatItems/Formats/DipValue.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.DipValue;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.DipValue.NameKey;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/Disk.cs b/SabreTools.DatItems/Formats/Disk.cs
index dc87808d..29d037fb 100644
--- a/SabreTools.DatItems/Formats/Disk.cs
+++ b/SabreTools.DatItems/Formats/Disk.cs
@@ -30,9 +30,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Disk;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Disk.NameKey;
-
         [JsonIgnore]
         public bool DiskAreaSpecified
         {
diff --git a/SabreTools.DatItems/Formats/DiskArea.cs b/SabreTools.DatItems/Formats/DiskArea.cs
index 488e45a4..7259f6e3 100644
--- a/SabreTools.DatItems/Formats/DiskArea.cs
+++ b/SabreTools.DatItems/Formats/DiskArea.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.DiskArea;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.DiskArea.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Display.cs b/SabreTools.DatItems/Formats/Display.cs
index 8967d38c..3dd11279 100644
--- a/SabreTools.DatItems/Formats/Display.cs
+++ b/SabreTools.DatItems/Formats/Display.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Display;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Driver.cs b/SabreTools.DatItems/Formats/Driver.cs
index 6b5fca92..d5c08193 100644
--- a/SabreTools.DatItems/Formats/Driver.cs
+++ b/SabreTools.DatItems/Formats/Driver.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Driver;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Extension.cs b/SabreTools.DatItems/Formats/Extension.cs
index 3ad73b2d..269942c3 100644
--- a/SabreTools.DatItems/Formats/Extension.cs
+++ b/SabreTools.DatItems/Formats/Extension.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Extension;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Extension.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Feature.cs b/SabreTools.DatItems/Formats/Feature.cs
index da34b373..938fb006 100644
--- a/SabreTools.DatItems/Formats/Feature.cs
+++ b/SabreTools.DatItems/Formats/Feature.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Feature;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Info.cs b/SabreTools.DatItems/Formats/Info.cs
index 11567358..c0288108 100644
--- a/SabreTools.DatItems/Formats/Info.cs
+++ b/SabreTools.DatItems/Formats/Info.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Info;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Instance.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Input.cs b/SabreTools.DatItems/Formats/Input.cs
index 4a77cabb..5ddc3e89 100644
--- a/SabreTools.DatItems/Formats/Input.cs
+++ b/SabreTools.DatItems/Formats/Input.cs
@@ -17,9 +17,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Input;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         [JsonIgnore]
         public bool ControlsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/Instance.cs b/SabreTools.DatItems/Formats/Instance.cs
index 069ea5a4..6dfc89e5 100644
--- a/SabreTools.DatItems/Formats/Instance.cs
+++ b/SabreTools.DatItems/Formats/Instance.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Instance;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Instance.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Media.cs b/SabreTools.DatItems/Formats/Media.cs
index f481feca..0d0108d8 100644
--- a/SabreTools.DatItems/Formats/Media.cs
+++ b/SabreTools.DatItems/Formats/Media.cs
@@ -16,9 +16,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Media;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Media.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Part.cs b/SabreTools.DatItems/Formats/Part.cs
index 4d0bff5a..6079f434 100644
--- a/SabreTools.DatItems/Formats/Part.cs
+++ b/SabreTools.DatItems/Formats/Part.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Part;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Part.NameKey;
-
         [JsonIgnore]
         public bool FeaturesSpecified
         {
diff --git a/SabreTools.DatItems/Formats/PartFeature.cs b/SabreTools.DatItems/Formats/PartFeature.cs
index b082d171..dd8ce967 100644
--- a/SabreTools.DatItems/Formats/PartFeature.cs
+++ b/SabreTools.DatItems/Formats/PartFeature.cs
@@ -24,9 +24,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.PartFeature;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Feature.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Port.cs b/SabreTools.DatItems/Formats/Port.cs
index fe9adc1e..4817b2f3 100644
--- a/SabreTools.DatItems/Formats/Port.cs
+++ b/SabreTools.DatItems/Formats/Port.cs
@@ -16,9 +16,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Port;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         [JsonIgnore]
         public bool AnalogsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/RamOption.cs b/SabreTools.DatItems/Formats/RamOption.cs
index 6439de7c..4c75e73f 100644
--- a/SabreTools.DatItems/Formats/RamOption.cs
+++ b/SabreTools.DatItems/Formats/RamOption.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.RamOption;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.RamOption.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Release.cs b/SabreTools.DatItems/Formats/Release.cs
index dd1e33d2..2d72b6a9 100644
--- a/SabreTools.DatItems/Formats/Release.cs
+++ b/SabreTools.DatItems/Formats/Release.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Release;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Release.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Rom.cs b/SabreTools.DatItems/Formats/Rom.cs
index 44cad95a..005e950b 100644
--- a/SabreTools.DatItems/Formats/Rom.cs
+++ b/SabreTools.DatItems/Formats/Rom.cs
@@ -30,9 +30,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Rom;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Rom.NameKey;
-
         [JsonIgnore]
         public bool ItemStatusSpecified
         {
diff --git a/SabreTools.DatItems/Formats/Sample.cs b/SabreTools.DatItems/Formats/Sample.cs
index ba9d3cc2..b4b6a89a 100644
--- a/SabreTools.DatItems/Formats/Sample.cs
+++ b/SabreTools.DatItems/Formats/Sample.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Sample;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Sample.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/SharedFeat.cs b/SabreTools.DatItems/Formats/SharedFeat.cs
index 6944ab94..36a9ea3c 100644
--- a/SabreTools.DatItems/Formats/SharedFeat.cs
+++ b/SabreTools.DatItems/Formats/SharedFeat.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.SharedFeat;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.SharedFeat.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Slot.cs b/SabreTools.DatItems/Formats/Slot.cs
index 461281b1..0d4fb684 100644
--- a/SabreTools.DatItems/Formats/Slot.cs
+++ b/SabreTools.DatItems/Formats/Slot.cs
@@ -16,9 +16,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Slot;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.Slot.NameKey;
-
         [JsonIgnore]
         public bool SlotOptionsSpecified
         {
diff --git a/SabreTools.DatItems/Formats/SlotOption.cs b/SabreTools.DatItems/Formats/SlotOption.cs
index 9820c7fb..03af05f4 100644
--- a/SabreTools.DatItems/Formats/SlotOption.cs
+++ b/SabreTools.DatItems/Formats/SlotOption.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.SlotOption;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.SlotOption.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/SoftwareList.cs b/SabreTools.DatItems/Formats/SoftwareList.cs
index 4795a241..2acb331d 100644
--- a/SabreTools.DatItems/Formats/SoftwareList.cs
+++ b/SabreTools.DatItems/Formats/SoftwareList.cs
@@ -15,9 +15,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.SoftwareList;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => Models.Metadata.SoftwareList.NameKey;
-
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/Formats/Sound.cs b/SabreTools.DatItems/Formats/Sound.cs
index f984ec97..89d7f77c 100644
--- a/SabreTools.DatItems/Formats/Sound.cs
+++ b/SabreTools.DatItems/Formats/Sound.cs
@@ -14,9 +14,6 @@ namespace SabreTools.DatItems.Formats
         /// <inheritdoc>/>
         protected override ItemType ItemType => ItemType.Sound;
 
-        /// <inheritdoc>/>
-        protected override string? NameKey => null;
-
         #endregion
 
         #region Constructors