diff --git a/SabreTools.Metadata.DatFiles/DatFile.cs b/SabreTools.Metadata.DatFiles/DatFile.cs
index b91b025f..ea5b2449 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.cs
@@ -19,7 +19,7 @@ namespace SabreTools.Metadata.DatFiles
     [JsonObject("datfile"), XmlRoot("datfile")]
     public abstract partial class DatFile
     {
-        #region Fields
+        #region Properties
 
         /// <summary>
         /// Header values
diff --git a/SabreTools.Metadata.DatFiles/DatHeader.cs b/SabreTools.Metadata.DatFiles/DatHeader.cs
index c8a63c92..3d601c9f 100644
--- a/SabreTools.Metadata.DatFiles/DatHeader.cs
+++ b/SabreTools.Metadata.DatFiles/DatHeader.cs
@@ -15,7 +15,7 @@ namespace SabreTools.Metadata.DatFiles
     [JsonObject("header"), XmlRoot("header")]
     public sealed class DatHeader : ModelBackedItem<Data.Models.Metadata.Header>, ICloneable
     {
-        #region Fields
+        #region Properties
 
         public string? Author
         {
diff --git a/SabreTools.Metadata.DatFiles/DatModifiers.cs b/SabreTools.Metadata.DatFiles/DatModifiers.cs
index f6ec9253..e10b2b7b 100644
--- a/SabreTools.Metadata.DatFiles/DatModifiers.cs
+++ b/SabreTools.Metadata.DatFiles/DatModifiers.cs
@@ -7,7 +7,7 @@ namespace SabreTools.Metadata.DatFiles
     /// </summary>
     public sealed class DatModifiers : ICloneable
     {
-        #region Fields
+        #region Properties
 
         /// <summary>
         /// Text to prepend to all outputted lines
diff --git a/SabreTools.Metadata.DatFiles/DatStatistics.cs b/SabreTools.Metadata.DatFiles/DatStatistics.cs
index 7bb127eb..8b0af504 100644
--- a/SabreTools.Metadata.DatFiles/DatStatistics.cs
+++ b/SabreTools.Metadata.DatFiles/DatStatistics.cs
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <summary>
         /// Overall item count
diff --git a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
index 23fae2da..eeeb506a 100644
--- a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
     /// </summary>
     public sealed class ClrMamePro : SerializableDatFile<Data.Models.ClrMamePro.MetadataFile, Serialization.Readers.ClrMamePro, Serialization.Writers.ClrMamePro, Serialization.CrossModel.ClrMamePro>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc/>
         public override Data.Models.Metadata.ItemType[] SupportedTypes
diff --git a/SabreTools.Metadata.DatFiles/Formats/Hashfile.cs b/SabreTools.Metadata.DatFiles/Formats/Hashfile.cs
index 66f928ef..0e986853 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Hashfile.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Hashfile.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
     /// </summary>
     public abstract class Hashfile : SerializableDatFile<Data.Models.Hashfile.Hashfile, Serialization.Readers.Hashfile, Serialization.Writers.Hashfile, Serialization.CrossModel.Hashfile>
     {
-        #region Fields
+        #region Properties
 
         // Private instance variables specific to Hashfile DATs
         protected HashType _hash;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
index 65b7eb7c..e85bb7d6 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
@@ -181,7 +181,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <inheritdoc/>
         public override Data.Models.Metadata.ItemType[] SupportedTypes
diff --git a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
index 7e5c0385..dfb47dbe 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
@@ -220,7 +220,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <inheritdoc/>
         public override Data.Models.Metadata.ItemType[] SupportedTypes
diff --git a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
index 1050b672..64819f1d 100644
--- a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
@@ -44,7 +44,7 @@ The softwaredb.xml file contains information about rom mapper types
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <inheritdoc/>
         public override Data.Models.Metadata.ItemType[] SupportedTypes
diff --git a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
index 1c253b65..c0bf2d1e 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
@@ -12,7 +12,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
     /// </summary>
     public abstract class SeparatedValue : SerializableDatFile<Data.Models.SeparatedValue.MetadataFile, Serialization.Readers.SeparatedValue, Serialization.Writers.SeparatedValue, Serialization.CrossModel.SeparatedValue>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc/>
         public override Data.Models.Metadata.ItemType[] SupportedTypes
diff --git a/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs b/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs
index 058422c7..03719549 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs
@@ -75,7 +75,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <inheritdoc/>
         public override Data.Models.Metadata.ItemType[] SupportedTypes
diff --git a/SabreTools.Metadata.DatFiles/ItemDictionary.cs b/SabreTools.Metadata.DatFiles/ItemDictionary.cs
index 809205eb..f55c46b0 100644
--- a/SabreTools.Metadata.DatFiles/ItemDictionary.cs
+++ b/SabreTools.Metadata.DatFiles/ItemDictionary.cs
@@ -47,7 +47,7 @@ namespace SabreTools.Metadata.DatFiles
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <summary>
         /// Get the keys in sorted order from the file dictionary
diff --git a/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs b/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
index 87fbb4a3..d53bd1de 100644
--- a/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
+++ b/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
@@ -134,7 +134,7 @@ namespace SabreTools.Metadata.DatFiles
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <summary>
         /// Get the keys in sorted order from the file dictionary
diff --git a/SabreTools.Metadata.DatItems/DatItem.cs b/SabreTools.Metadata.DatItems/DatItem.cs
index 9b037f83..521e3860 100644
--- a/SabreTools.Metadata.DatItems/DatItem.cs
+++ b/SabreTools.Metadata.DatItems/DatItem.cs
@@ -55,7 +55,7 @@ namespace SabreTools.Metadata.DatItems
     [XmlInclude(typeof(SourceDetails))]
     public abstract class DatItem : ModelBackedItem<Data.Models.Metadata.DatItem>, IEquatable<DatItem>, IComparable<DatItem>, ICloneable
     {
-        #region Fields
+        #region Properties
 
         /// <summary>
         /// Duplicate type when compared to another item
diff --git a/SabreTools.Metadata.DatItems/Formats/Adjuster.cs b/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
index 60b1d536..2588700e 100644
--- a/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("adjuster"), XmlRoot("adjuster")]
     public sealed class Adjuster : DatItem<Data.Models.Metadata.Adjuster>
     {
-        #region Fields
+        #region Properties
 
         public Condition? Condition { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Analog.cs b/SabreTools.Metadata.DatItems/Formats/Analog.cs
index fe068969..31d1b434 100644
--- a/SabreTools.Metadata.DatItems/Formats/Analog.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Analog.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("analog"), XmlRoot("analog")]
     public sealed class Analog : DatItem<Data.Models.Metadata.Analog>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/Archive.cs b/SabreTools.Metadata.DatItems/Formats/Archive.cs
index 42ed0b54..633ba14f 100644
--- a/SabreTools.Metadata.DatItems/Formats/Archive.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Archive.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("archive"), XmlRoot("archive")]
     public sealed class Archive : DatItem<Data.Models.Metadata.Archive>
     {
-        #region Fields
+        #region Properties
 
         public string? Additional
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Blank.cs b/SabreTools.Metadata.DatItems/Formats/Blank.cs
index b31e26f1..fbc24c20 100644
--- a/SabreTools.Metadata.DatItems/Formats/Blank.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Blank.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("blank"), XmlRoot("blank")]
     public sealed class Blank : DatItem<Data.Models.Metadata.Blank>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/Chip.cs b/SabreTools.Metadata.DatItems/Formats/Chip.cs
index ac0b6f8f..4568ab77 100644
--- a/SabreTools.Metadata.DatItems/Formats/Chip.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Chip.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("chip"), XmlRoot("chip")]
     public sealed class Chip : DatItem<Data.Models.Metadata.Chip>
     {
-        #region Fields
+        #region Properties
 
         public Data.Models.Metadata.ChipType? ChipType
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Condition.cs b/SabreTools.Metadata.DatItems/Formats/Condition.cs
index 0621276d..a5fc1577 100644
--- a/SabreTools.Metadata.DatItems/Formats/Condition.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Condition.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("condition"), XmlRoot("condition")]
     public sealed class Condition : DatItem<Data.Models.Metadata.Condition>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs b/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
index cd5ce116..0001458c 100644
--- a/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("conflocation"), XmlRoot("conflocation")]
     public sealed class ConfLocation : DatItem<Data.Models.Metadata.ConfLocation>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
index 6af0334c..59f36e85 100644
--- a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("confsetting"), XmlRoot("confsetting")]
     public sealed class ConfSetting : DatItem<Data.Models.Metadata.ConfSetting>
     {
-        #region Fields
+        #region Properties
 
         public Condition? Condition { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Configuration.cs b/SabreTools.Metadata.DatItems/Formats/Configuration.cs
index 2a96bdb1..49f44e46 100644
--- a/SabreTools.Metadata.DatItems/Formats/Configuration.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Configuration.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("configuration"), XmlRoot("configuration")]
     public sealed class Configuration : DatItem<Data.Models.Metadata.Configuration>
     {
-        #region Fields
+        #region Properties
 
         public Condition? Condition { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Control.cs b/SabreTools.Metadata.DatItems/Formats/Control.cs
index aaa21346..5e92e7bc 100644
--- a/SabreTools.Metadata.DatItems/Formats/Control.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Control.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("control"), XmlRoot("control")]
     public sealed class Control : DatItem<Data.Models.Metadata.Control>
     {
-        #region Fields
+        #region Properties
 
         public long? Buttons
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/DataArea.cs b/SabreTools.Metadata.DatItems/Formats/DataArea.cs
index 5d1c4525..0688cef3 100644
--- a/SabreTools.Metadata.DatItems/Formats/DataArea.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DataArea.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("dataarea"), XmlRoot("dataarea")]
     public sealed class DataArea : DatItem<Data.Models.Metadata.DataArea>
     {
-        #region Fields
+        #region Properties
 
         public Data.Models.Metadata.Endianness? Endianness
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Device.cs b/SabreTools.Metadata.DatItems/Formats/Device.cs
index 600965fa..6a688d3e 100644
--- a/SabreTools.Metadata.DatItems/Formats/Device.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Device.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("device"), XmlRoot("device")]
     public sealed class Device : DatItem<Data.Models.Metadata.Device>
     {
-        #region Fields
+        #region Properties
 
         public Data.Models.Metadata.DeviceType? DeviceType
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs b/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs
index 7c16f71a..d9d5fca5 100644
--- a/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("device_ref"), XmlRoot("device_ref")]
     public sealed class DeviceRef : DatItem<Data.Models.Metadata.DeviceRef>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/DipLocation.cs b/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
index 2f0d6870..dba825e1 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("diplocation"), XmlRoot("diplocation")]
     public sealed class DipLocation : DatItem<Data.Models.Metadata.DipLocation>
     {
-        #region Fields
+        #region Properties
 
         public bool? Inverted
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
index 1253d655..ff4ad9ef 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("dipswitch"), XmlRoot("dipswitch")]
     public sealed class DipSwitch : DatItem<Data.Models.Metadata.DipSwitch>
     {
-        #region Fields
+        #region Properties
 
         public Condition? Condition { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/DipValue.cs b/SabreTools.Metadata.DatItems/Formats/DipValue.cs
index 48da33fb..5a2c3d25 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipValue.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipValue.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("dipvalue"), XmlRoot("dipvalue")]
     public sealed class DipValue : DatItem<Data.Models.Metadata.DipValue>
     {
-        #region Fields
+        #region Properties
 
         public Condition? Condition { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Disk.cs b/SabreTools.Metadata.DatItems/Formats/Disk.cs
index 60c6f769..2aaa11a7 100644
--- a/SabreTools.Metadata.DatItems/Formats/Disk.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Disk.cs
@@ -12,7 +12,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("disk"), XmlRoot("disk")]
     public sealed class Disk : DatItem<Data.Models.Metadata.Disk>
     {
-        #region Fields
+        #region Properties
 
         public DiskArea? DiskArea { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/DiskArea.cs b/SabreTools.Metadata.DatItems/Formats/DiskArea.cs
index 6c08ec64..dff2e968 100644
--- a/SabreTools.Metadata.DatItems/Formats/DiskArea.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DiskArea.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("diskarea"), XmlRoot("diskarea")]
     public sealed class DiskArea : DatItem<Data.Models.Metadata.DiskArea>
     {
-        #region Fields
+        #region Properties
 
         public Disk[]? Disk { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Display.cs b/SabreTools.Metadata.DatItems/Formats/Display.cs
index 4077ff8d..2e469fdd 100644
--- a/SabreTools.Metadata.DatItems/Formats/Display.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Display.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("display"), XmlRoot("display")]
     public sealed class Display : DatItem<Data.Models.Metadata.Display>
     {
-        #region Fields
+        #region Properties
 
         public long? AspectX
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Driver.cs b/SabreTools.Metadata.DatItems/Formats/Driver.cs
index bc067f8b..44dbaa96 100644
--- a/SabreTools.Metadata.DatItems/Formats/Driver.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Driver.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("driver"), XmlRoot("driver")]
     public sealed class Driver : DatItem<Data.Models.Metadata.Driver>
     {
-        #region Fields
+        #region Properties
 
         public Data.Models.Metadata.Blit? Blit
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Extension.cs b/SabreTools.Metadata.DatItems/Formats/Extension.cs
index 6a734f5f..bcf8cf8f 100644
--- a/SabreTools.Metadata.DatItems/Formats/Extension.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Extension.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("extension"), XmlRoot("extension")]
     public sealed class Extension : DatItem<Data.Models.Metadata.Extension>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/Feature.cs b/SabreTools.Metadata.DatItems/Formats/Feature.cs
index dc70d747..6d29df12 100644
--- a/SabreTools.Metadata.DatItems/Formats/Feature.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Feature.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("feature"), XmlRoot("feature")]
     public sealed class Feature : DatItem<Data.Models.Metadata.Feature>
     {
-        #region Fields
+        #region Properties
 
         public Data.Models.Metadata.FeatureType? FeatureType
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/File.cs b/SabreTools.Metadata.DatItems/Formats/File.cs
index e52b9e4c..2f965764 100644
--- a/SabreTools.Metadata.DatItems/Formats/File.cs
+++ b/SabreTools.Metadata.DatItems/Formats/File.cs
@@ -25,7 +25,7 @@ namespace SabreTools.Metadata.DatItems.Formats
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.File;
diff --git a/SabreTools.Metadata.DatItems/Formats/Info.cs b/SabreTools.Metadata.DatItems/Formats/Info.cs
index 7ee61a84..0e17aee1 100644
--- a/SabreTools.Metadata.DatItems/Formats/Info.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Info.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("info"), XmlRoot("info")]
     public sealed class Info : DatItem<Data.Models.Metadata.Info>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/Input.cs b/SabreTools.Metadata.DatItems/Formats/Input.cs
index d3ffe936..777d27d5 100644
--- a/SabreTools.Metadata.DatItems/Formats/Input.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Input.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("input"), XmlRoot("input")]
     public sealed class Input : DatItem<Data.Models.Metadata.Input>
     {
-        #region Fields
+        #region Properties
 
         public long? Buttons
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Instance.cs b/SabreTools.Metadata.DatItems/Formats/Instance.cs
index 7c4ddc50..c443f41e 100644
--- a/SabreTools.Metadata.DatItems/Formats/Instance.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Instance.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("instance"), XmlRoot("instance")]
     public sealed class Instance : DatItem<Data.Models.Metadata.Instance>
     {
-        #region Fields
+        #region Properties
 
         public string? BriefName
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Media.cs b/SabreTools.Metadata.DatItems/Formats/Media.cs
index 6711d97d..77f3d441 100644
--- a/SabreTools.Metadata.DatItems/Formats/Media.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Media.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("media"), XmlRoot("media")]
     public sealed class Media : DatItem<Data.Models.Metadata.Media>
     {
-        #region Fields
+        #region Properties
 
         public string? MD5
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Original.cs b/SabreTools.Metadata.DatItems/Formats/Original.cs
index 0b654191..b70be6bd 100644
--- a/SabreTools.Metadata.DatItems/Formats/Original.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Original.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("original"), XmlRoot("original")]
     public sealed class Original
     {
-        #region Fields
+        #region Properties
 
         [JsonProperty("content"), XmlElement("content")]
         public string? Content
diff --git a/SabreTools.Metadata.DatItems/Formats/Part.cs b/SabreTools.Metadata.DatItems/Formats/Part.cs
index 13cae7ae..57df8892 100644
--- a/SabreTools.Metadata.DatItems/Formats/Part.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Part.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("part"), XmlRoot("part")]
     public sealed class Part : DatItem<Data.Models.Metadata.Part>
     {
-        #region Fields
+        #region Properties
 
         public DataArea[]? DataArea { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/PartFeature.cs b/SabreTools.Metadata.DatItems/Formats/PartFeature.cs
index c074b544..69aa929f 100644
--- a/SabreTools.Metadata.DatItems/Formats/PartFeature.cs
+++ b/SabreTools.Metadata.DatItems/Formats/PartFeature.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("part_feature"), XmlRoot("part_feature")]
     public sealed class PartFeature : DatItem<Data.Models.Metadata.Feature>
     {
-        #region Fields
+        #region Properties
 
         public Data.Models.Metadata.FeatureType? FeatureType
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Port.cs b/SabreTools.Metadata.DatItems/Formats/Port.cs
index adfc986d..d5b6b252 100644
--- a/SabreTools.Metadata.DatItems/Formats/Port.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Port.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("port"), XmlRoot("port")]
     public sealed class Port : DatItem<Data.Models.Metadata.Port>
     {
-        #region Fields
+        #region Properties
 
         public Analog[]? Analog { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs b/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs
index ee887863..a40e095c 100644
--- a/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("release_details"), XmlRoot("release_details")]
     public sealed class ReleaseDetails : DatItem<Data.Models.Metadata.ReleaseDetails>
     {
-        #region Fields
+        #region Properties
 
         public string? AppendToNumber
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Rom.cs b/SabreTools.Metadata.DatItems/Formats/Rom.cs
index f8ba3e6d..95d72e0d 100644
--- a/SabreTools.Metadata.DatItems/Formats/Rom.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Rom.cs
@@ -18,7 +18,7 @@ namespace SabreTools.Metadata.DatItems.Formats
 
         #endregion
 
-        #region Fields
+        #region Properties
 
         public DataArea? DataArea { get; set; }
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Sample.cs b/SabreTools.Metadata.DatItems/Formats/Sample.cs
index d2b28deb..2db5f59c 100644
--- a/SabreTools.Metadata.DatItems/Formats/Sample.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Sample.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("sample"), XmlRoot("sample")]
     public class Sample : DatItem<Data.Models.Metadata.Sample>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/Serials.cs b/SabreTools.Metadata.DatItems/Formats/Serials.cs
index c9fb8c6b..bf294bb7 100644
--- a/SabreTools.Metadata.DatItems/Formats/Serials.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Serials.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("serials"), XmlRoot("serials")]
     public sealed class Serials : DatItem<Data.Models.Metadata.Serials>
     {
-        #region Fields
+        #region Properties
 
         public string? BoxBarcode
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs b/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs
index 7faff216..0406fa1c 100644
--- a/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("sharedfeat"), XmlRoot("sharedfeat")]
     public sealed class SharedFeat : DatItem<Data.Models.Metadata.SharedFeat>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/Slot.cs b/SabreTools.Metadata.DatItems/Formats/Slot.cs
index d331501e..81e3348f 100644
--- a/SabreTools.Metadata.DatItems/Formats/Slot.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Slot.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("slot"), XmlRoot("slot")]
     public sealed class Slot : DatItem<Data.Models.Metadata.Slot>
     {
-        #region Fields
+        #region Properties
 
         /// <inheritdoc>/>
         public override Data.Models.Metadata.ItemType ItemType
diff --git a/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs b/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs
index 739dd847..e3bec0c8 100644
--- a/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("softwarelist"), XmlRoot("softwarelist")]
     public sealed class SoftwareList : DatItem<Data.Models.Metadata.SoftwareList>
     {
-        #region Fields
+        #region Properties
 
         public string? Filter
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Sound.cs b/SabreTools.Metadata.DatItems/Formats/Sound.cs
index f12e4d95..dbdcaa22 100644
--- a/SabreTools.Metadata.DatItems/Formats/Sound.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Sound.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("sound"), XmlRoot("sound")]
     public sealed class Sound : DatItem<Data.Models.Metadata.Sound>
     {
-        #region Fields
+        #region Properties
 
         public long? Channels
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs b/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs
index 47300b8f..5dbdcda6 100644
--- a/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("source_details"), XmlRoot("source_details")]
     public sealed class SourceDetails : DatItem<Data.Models.Metadata.SourceDetails>
     {
-        #region Fields
+        #region Properties
 
         public string? AppendToNumber
         {
diff --git a/SabreTools.Metadata.DatItems/Machine.cs b/SabreTools.Metadata.DatItems/Machine.cs
index 8ec8b66d..ad7c2d57 100644
--- a/SabreTools.Metadata.DatItems/Machine.cs
+++ b/SabreTools.Metadata.DatItems/Machine.cs
@@ -13,7 +13,7 @@ namespace SabreTools.Metadata.DatItems
     [JsonObject("machine"), XmlRoot("machine")]
     public sealed class Machine : ModelBackedItem<Data.Models.Metadata.Machine>, ICloneable, IEquatable<Machine>
     {
-        #region Fields
+        #region Properties
 
         public string? Board
         {
diff --git a/SabreTools.Metadata.Filter/ExtraIniItem.cs b/SabreTools.Metadata.Filter/ExtraIniItem.cs
index adcbac03..d6135d52 100644
--- a/SabreTools.Metadata.Filter/ExtraIniItem.cs
+++ b/SabreTools.Metadata.Filter/ExtraIniItem.cs
@@ -8,7 +8,7 @@ namespace SabreTools.Metadata.Filter
 {
     public class ExtraIniItem
     {
-        #region Fields
+        #region Properties
 
         /// <summary>
         /// Item type and field to update with INI information