Reduce use of GetName and SetName, prefer direct

SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs

@@ -19,13 +19,9 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
-            DatItem datItem = new Rom();
+            DatItem datItem = new Rom { Name = "rom.bin", };
-            datItem.SetName("rom.bin");
             datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             datItem.Machine = machine;
             datItem.Source = source;
@@ -49,13 +45,9 @@ namespace SabreTools.Metadata.DatFiles.Test
 
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
-            DatItem datItem = new Rom();
+            DatItem datItem = new Rom { Name = "rom.bin" };
-            datItem.SetName("rom.bin");
             datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             datItem.Machine = machine;
             datItem.Source = source;
@@ -135,10 +127,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem rom = new Rom
             {
@@ -147,10 +136,12 @@ namespace SabreTools.Metadata.DatFiles.Test
                 Source = source
             };
 
-            DatItem disk = new Disk();
+            DatItem disk = new Disk
-            disk.SetName("disk");
+            {
-            disk.Machine = machine;
+                Name = "disk",
-            disk.Source = source;
+                Machine = machine,
+                Source = source
+            };
 
             DatFile datFile = new Logiqx(datFile: null, useGame: false);
             datFile.AddItem(rom, statsOnly: false);
@@ -178,18 +169,11 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
-            DatItem rom = new Rom
+            DatItem rom = new Rom { Name = "rom.bin" };
-            {
-                Name = "rom.bin"
-            };
 
-            DatItem disk = new Disk();
+            DatItem disk = new Disk { Name = "disk" };
-            disk.SetName("disk");
 
             DatFile datFile = new Logiqx(datFile: null, useGame: false);
             long sourceIndex = datFile.AddSourceDB(source);
@@ -221,10 +205,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void SetOneGamePerRegion_Items()
         {
-            Machine nowhereMachine = new Machine
+            Machine nowhereMachine = new Machine { Name = "machine (Nowhere)" };
-            {
-                Name = "machine (Nowhere)"
-            };
 
             Machine worldMachine = new Machine
             {
@@ -232,13 +213,17 @@ namespace SabreTools.Metadata.DatFiles.Test
                 CloneOf = "machine (Nowhere)"
             };
 
-            DatItem nowhereRom = new Rom();
+            DatItem nowhereRom = new Rom
-            nowhereRom.SetName("rom.bin");
+            {
-            nowhereRom.Machine = nowhereMachine;
+                Name = "rom.bin",
+                Machine = nowhereMachine
+            };
 
-            DatItem worldRom = new Rom();
+            DatItem worldRom = new Rom
-            worldRom.SetName("rom.nib");
+            {
-            worldRom.Machine = worldMachine;
+                Name = "rom.nib",
+                Machine = worldMachine
+            };
 
             DatFile datFile = new Logiqx(datFile: null, useGame: false);
             datFile.AddItem(nowhereRom, statsOnly: false);
@@ -259,10 +244,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void SetOneGamePerRegion_ItemsDB()
         {
-            Machine nowhereMachine = new Machine
+            Machine nowhereMachine = new Machine { Name = "machine (Nowhere)" };
-            {
-                Name = "machine (Nowhere)"
-            };
 
             Machine worldMachine = new Machine
             {
@@ -291,10 +273,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "10.10.10-machine-name" };
-            {
-                Name = "10.10.10-machine-name"
-            };
 
             DatItem datItem = new Rom
             {
@@ -317,10 +296,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void StripSceneDatesFromItems_ItemsDB()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "10.10.10-machine-name" };
-            {
-                Name = "10.10.10-machine-name"
-            };
 
             DatFile datFile = new Logiqx(datFile: null, useGame: false);
             _ = datFile.AddMachineDB(machine);

SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs

@@ -14,10 +14,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -26,20 +23,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -60,10 +66,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -72,20 +75,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -106,10 +118,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -118,20 +127,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -155,10 +173,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -167,20 +182,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -208,10 +232,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -220,20 +241,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -254,10 +284,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -266,20 +293,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -317,41 +353,46 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsDevice = true
             };
 
-            Machine slotOptionMachine = new Machine
+            Machine slotOptionMachine = new Machine { Name = "slotoption", };
+
+            Machine itemMachine = new Machine { Name = "machine", };
+
+            DatItem deviceItem = new Sample
             {
-                Name = "slotoption"
+                Name = "device_item",
+                Machine = deviceMachine,
+                Source = source,
             };
 
-            Machine itemMachine = new Machine
+            DatItem slotOptionItem = new Sample
             {
-                Name = "machine"
+                Name = "slot_option_item",
+                Machine = slotOptionMachine,
+                Source = source,
             };
 
-            DatItem deviceItem = new Sample();
+            DatItem datItem = new Rom
-            deviceItem.SetName("device_item");
+            {
-            deviceItem.Machine = deviceMachine;
+                Name = "rom",
-            deviceItem.Source = source;
+                Size = 12345,
-
+            };
-            DatItem slotOptionItem = new Sample();
-            slotOptionItem.SetName("slot_option_item");
-            slotOptionItem.Machine = slotOptionMachine;
-            slotOptionItem.Source = source;
-
-            DatItem datItem = new Rom() { Size = 12345 };
-            datItem.SetName("rom");
             datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             datItem.Machine = itemMachine;
             datItem.Source = source;
 
-            DatItem deviceRef = new DeviceRef();
+            DatItem deviceRef = new DeviceRef
-            deviceRef.SetName("device");
+            {
-            deviceRef.Machine = itemMachine;
+                Name = "device",
-            deviceRef.Source = source;
+                Machine = itemMachine,
+                Source = source,
+            };
 
-            DatItem slotOption = new SlotOption();
+            DatItem slotOption = new SlotOption
-            slotOption.SetName("slotoption");
+            {
-            slotOption.Machine = itemMachine;
+                Name = "slotoption",
-            slotOption.Source = source;
+                Machine = itemMachine,
+                Source = source,
+            };
 
             DatFile datFile = new Logiqx(datFile: null, useGame: false);
             datFile.AddItem(deviceItem, statsOnly: false);
@@ -378,35 +419,34 @@ namespace SabreTools.Metadata.DatFiles.Test
             Machine deviceMachine = new Machine
             {
                 Name = "device",
-                IsDevice = true
+                IsDevice = true,
             };
 
-            Machine slotOptionMachine = new Machine
+            Machine slotOptionMachine = new Machine { Name = "slotoption", };
+
+            Machine itemMachine = new Machine { Name = "machine", };
+
+            DatItem deviceItem = new Sample { Name = "device_item", };
+
+            DatItem slotOptionItem = new Sample { Name = "slot_option_item", };
+
+            DatItem datItem = new Rom
+            {
+                Name = "rom",
+                Size = 12345,
+            };
+            datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
+
+            DatItem deviceRef = new DeviceRef
+            {
+                Name = "device",
+            };
+
+            DatItem slotOption = new SlotOption
             {
                 Name = "slotoption"
             };
 
-            Machine itemMachine = new Machine
-            {
-                Name = "machine"
-            };
-
-            DatItem deviceItem = new Sample();
-            deviceItem.SetName("device_item");
-
-            DatItem slotOptionItem = new Sample();
-            slotOptionItem.SetName("slot_option_item");
-
-            DatItem datItem = new Rom() { Size = 12345 };
-            datItem.SetName("rom");
-            datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
-
-            DatItem deviceRef = new DeviceRef();
-            deviceRef.SetName("device");
-
-            DatItem slotOption = new SlotOption();
-            slotOption.SetName("slotoption");
-
             DatFile datFile = new Logiqx(datFile: null, useGame: false);
             long deviceMachineIndex = datFile.AddMachineDB(deviceMachine);
             long slotOptionMachineIndex = datFile.AddMachineDB(slotOptionMachine);
@@ -433,10 +473,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -445,20 +482,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -479,10 +525,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -491,20 +534,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -621,20 +673,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 CloneOf = "parent"
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -672,20 +733,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 CloneOf = "parent"
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -718,10 +788,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -730,20 +797,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;
@@ -768,10 +844,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine parentMachine = new Machine
+            Machine parentMachine = new Machine { Name = "parent" };
-            {
-                Name = "parent"
-            };
 
             Machine childMachine = new Machine
             {
@@ -780,20 +853,29 @@ namespace SabreTools.Metadata.DatFiles.Test
                 IsBios = true
             };
 
-            DatItem parentItem = new Rom() { Size = 12345 };
+            DatItem parentItem = new Rom
-            parentItem.SetName("parent_rom");
+            {
+                Name = "parent_rom",
+                Size = 12345,
+            };
             parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             parentItem.Machine = parentMachine;
             parentItem.Source = source;
 
-            DatItem matchChildItem = new Rom() { Size = 12345 };
+            DatItem matchChildItem = new Rom
-            matchChildItem.SetName("match_child_rom");
+            {
+                Name = "match_child_rom",
+                Size = 12345,
+            };
             matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             matchChildItem.Machine = childMachine;
             matchChildItem.Source = source;
 
-            DatItem noMatchChildItem = new Rom() { Size = 12345 };
+            DatItem noMatchChildItem = new Rom
-            noMatchChildItem.SetName("no_match_child_rom");
+            {
+                Name = "no_match_child_rom",
+                Size = 12345,
+            };
             noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
             noMatchChildItem.Machine = childMachine;
             noMatchChildItem.Source = source;

SabreTools.Metadata.DatFiles.Test/DatFileTests.cs

@@ -30,15 +30,9 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "key" };
-            {
-                Name = "key"
-            };
 
-            DatItem rom = new Rom
+            DatItem rom = new Rom { Name = "rom" };
-            {
-                Name = "rom"
-            };
             rom.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             rom.Source = source;
             rom.Machine = machine;
@@ -76,10 +70,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem datItem = new Rom
             {
@@ -99,10 +90,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem datItem = new Rom();
 
@@ -246,10 +234,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void SetHeaderTest()
         {
-            DatHeader datHeader = new DatHeader
+            DatHeader datHeader = new DatHeader { Name = "name" };
-            {
-                Name = "name"
-            };
 
             DatFile? datFile = new Logiqx(datFile: null, useGame: false);
             datFile.Header.Name = "notname";
@@ -1342,15 +1327,9 @@ namespace SabreTools.Metadata.DatFiles.Test
             bool gameName,
             string expected)
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
-            DatItem item = new Rom
+            DatItem item = new Rom { Name = "name" };
-            {
-                Name = "name"
-            };
             item.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
 
             DatFile? datFile = new Logiqx(datFile: null, useGame: false);
@@ -1425,10 +1404,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             };
             machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
 
-            DatItem item = new Disk
+            DatItem item = new Disk { Name = "name" };
-            {
-                Name = "name"
-            };
             item.Write(Data.Models.Metadata.Disk.MD5Key, "md5");
             item.Write(Data.Models.Metadata.Disk.SHA1Key, "sha1");
 
@@ -1985,10 +1961,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ResolveNames_SingleItem_Single()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             Source source = new Source(0);
 
@@ -2017,10 +1990,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ResolveNames_NonDuplicate_AllUntouched()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             Source source = new Source(0);
 
@@ -2065,10 +2035,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ResolveNames_AllDuplicate_Single()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             Source source = new Source(0);
 
@@ -2106,10 +2073,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ResolveNames_NameMatch_SingleRenamed()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             Source source = new Source(0);
 
@@ -2169,10 +2133,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ResolveNamesDB_SingleItem_Single()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             Source source = new Source(0);
 
@@ -2203,10 +2164,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ResolveNamesDB_NonDuplicate_AllUntouched()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             Source source = new Source(0);
 
@@ -2256,10 +2214,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             DatFile datFile = new Logiqx(null, useGame: false);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
             long machineIndex = datFile.AddMachineDB(machine);
 
             Source source = new Source(0);
@@ -2299,10 +2254,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ResolveNamesDB_NameMatch_SingleRenamed()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             Source source = new Source(0);
 
@@ -2364,10 +2316,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ShouldIgnore_RemoveSet_True()
         {
-            DatItem? datItem = new Rom
+            DatItem? datItem = new Rom { RemoveFlag = true };
-            {
-                RemoveFlag = true
-            };
             DatFile datFile = new Logiqx(null, useGame: false);
 
             bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true);
@@ -2397,8 +2346,11 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ShouldIgnore_NoIgnoreBlanksZeroRom_False()
         {
-            DatItem? datItem = new Rom() { Size = 12345 };
+            DatItem? datItem = new Rom
-            datItem.SetName("name");
+            {
+                Name = "name",
+                Size = 12345,
+            };
             datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
             DatFile datFile = new Logiqx(null, useGame: false);
 
@@ -2419,8 +2371,11 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ShouldIgnore_MissingRequired_True()
         {
-            DatItem? datItem = new Rom() { Size = 12345 };
+            DatItem? datItem = new Rom
-            datItem.SetName("name");
+            {
+                Name = "name",
+                Size = 12345,
+            };
             DatFile datFile = new Logiqx(null, useGame: false);
 
             bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true);
@@ -2430,8 +2385,11 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void ShouldIgnore_AllVerified_False()
         {
-            DatItem? datItem = new Rom() { Size = 12345 };
+            DatItem? datItem = new Rom
-            datItem.SetName("name");
+            {
+                Name = "name",
+                Size = 12345,
+            };
             datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
             datItem.Write(Data.Models.Metadata.Rom.MD2Key, "crc");
             datItem.Write(Data.Models.Metadata.Rom.MD4Key, "crc");

SabreTools.Metadata.DatFiles.Test/DatHeaderTests.cs

@@ -117,8 +117,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void CloneTest()
         {
-            DatHeader header = new DatHeader();
+            DatHeader header = new DatHeader { Name = "name" };
-            header.Name = "name";
 
             object clone = header.Clone();
             DatHeader? actual = clone as DatHeader;
@@ -133,8 +132,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void CloneFormatTest()
         {
-            DatHeader header = new DatHeader();
+            DatHeader header = new DatHeader { DatFormat = DatFormat.Logiqx };
-            header.DatFormat = DatFormat.Logiqx;
 
             object clone = header.Clone();
             DatHeader? actual = clone as DatHeader;
@@ -149,8 +147,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void GetInternalCloneTest()
         {
-            DatHeader header = new DatHeader();
+            DatHeader header = new DatHeader { Name = "name" };
-            header.Name = "name";
 
             Data.Models.Metadata.Header actual = header.GetInternalClone();
             Assert.Equal("name", actual.Name);
@@ -183,11 +180,9 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void Equals_MismatchedInternal_False()
         {
-            DatHeader self = new DatHeader();
+            DatHeader self = new DatHeader { Name = "self" };
-            self.Name = "self";
 
-            DatHeader? other = new DatHeader();
+            DatHeader? other = new DatHeader { Name = "other" };
-            other.Name = "other";
 
             bool actual = self.Equals(other);
             Assert.False(actual);
@@ -196,11 +191,9 @@ namespace SabreTools.Metadata.DatFiles.Test
         [Fact]
         public void Equals_EqualInternal_True()
         {
-            DatHeader self = new DatHeader();
+            DatHeader self = new DatHeader { Name = "name" };
-            self.Name = "name";
 
-            DatHeader? other = new DatHeader();
+            DatHeader? other = new DatHeader { Name = "name" };
-            other.Name = "name";
 
             bool actual = self.Equals(other);
             Assert.True(actual);

SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs

@@ -251,10 +251,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         /// </summary>
         private static Disk CreateDisk()
         {
-            var disk = new Disk
+            var disk = new Disk { Status = ItemStatus.Good };
-            {
-                Status = ItemStatus.Good
-            };
             disk.Write<string?>(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
             disk.Write<string?>(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
 

SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs

@@ -16,8 +16,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem disk = new Disk();
+            DatItem disk = new Disk { Name = "item" };
-            disk.SetName("item");
             disk.Write<string?>(Data.Models.Metadata.Disk.SHA1Key, "deadbeef");
 
             var dict = new ItemDictionaryDB();
@@ -37,8 +36,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem disk = new Disk();
+            DatItem disk = new Disk { Name = "item" };
-            disk.SetName("item");
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -57,9 +55,8 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            var file = new File();
+            var file = new File { SHA1 = "deadbeef" };
             file.SetName("item");
-            file.SHA1 = "deadbeef";
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -96,8 +93,11 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem media = new Media() { SHA1 = "deadbeef" };
+            DatItem media = new Media
-            media.SetName("item");
+            {
+                SHA1 = "deadbeef",
+                Name = "item"
+            };
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -115,8 +115,10 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem media = new Media();
+            DatItem media = new Media
-            media.SetName("item");
+            {
+                Name = "item"
+            };
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -185,10 +187,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem rom = new Rom
+            DatItem rom = new Rom { Name = "item" };
-            {
-                Name = "item"
-            };
             rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
 
             var dict = new ItemDictionaryDB();
@@ -210,10 +209,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem rom = new Rom
+            DatItem rom = new Rom { Name = "item" };
-            {
-                Name = "item"
-            };
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -234,10 +230,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem item = new Rom
+            DatItem item = new Rom { Name = "item" };
-            {
-                Name = "item"
-            };
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -253,10 +246,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem item = new Rom
+            DatItem item = new Rom { Name = "item" };
-            {
-                Name = "item"
-            };
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -306,10 +296,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             // Setup the items
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom()
             {
@@ -351,10 +338,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom();
 
@@ -373,10 +357,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom();
 
@@ -395,15 +376,9 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
-            DatItem item = new Rom
+            DatItem item = new Rom { RemoveFlag = true };
-            {
-                RemoveFlag = true
-            };
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -420,15 +395,9 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
-            DatItem item = new Rom
+            DatItem item = new Rom { RemoveFlag = true };
-            {
-                RemoveFlag = true
-            };
 
             var dict = new ItemDictionaryDB();
             long sourceIndex = dict.AddSource(source);
@@ -445,10 +414,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom();
 
@@ -545,15 +511,9 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine origMachine = new Machine
+            Machine origMachine = new Machine { Name = "original" };
-            {
-                Name = "original"
-            };
 
-            Machine newMachine = new Machine
+            Machine newMachine = new Machine { Name = "new" };
-            {
-                Name = "new"
-            };
 
             DatItem datItem = new Rom();
 
@@ -580,10 +540,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem datItem = new Rom()
             {
@@ -612,10 +569,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem datItem = new Rom()
             {
@@ -665,15 +619,9 @@ namespace SabreTools.Metadata.DatFiles.Test
             // Setup the items
             Source source = new Source(0, source: null);
 
-            Machine machine1 = new Machine
+            Machine machine1 = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
-            Machine machine2 = new Machine
+            Machine machine2 = new Machine { Name = "game-2" };
-            {
-                Name = "game-2"
-            };
 
             DatItem rom1 = new Rom
             {
@@ -731,10 +679,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             // Setup the items
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom
             {
@@ -804,30 +749,18 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source? sourceB = new Source(1);
             long sourceBIndex = dict.AddSource(sourceB);
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineAIndex = dict.AddMachine(machineA);
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineBIndex = dict.AddMachine(machineB);
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
             long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
             KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
             KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -846,30 +779,18 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source? sourceB = new Source(1);
             long sourceBIndex = dict.AddSource(sourceB);
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineAIndex = dict.AddMachine(machineA);
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineBIndex = dict.AddMachine(machineB);
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
             KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
             KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -888,30 +809,18 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source? sourceB = new Source(1);
             long sourceBIndex = dict.AddSource(sourceB);
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineAIndex = dict.AddMachine(machineA);
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "not-name-same" };
-            {
-                Name = "not-name-same"
-            };
             long machineBIndex = dict.AddMachine(machineB);
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
             KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
             KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -930,30 +839,18 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source? sourceB = new Source(0);
             long sourceBIndex = dict.AddSource(sourceB);
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineAIndex = dict.AddMachine(machineA);
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineBIndex = dict.AddMachine(machineB);
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
             KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
             KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -972,30 +869,18 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source? sourceB = new Source(0);
             long sourceBIndex = dict.AddSource(sourceB);
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
             long machineAIndex = dict.AddMachine(machineA);
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "not-name-same" };
-            {
-                Name = "not-name-same"
-            };
             long machineBIndex = dict.AddMachine(machineB);
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
             KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
             KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -1016,10 +901,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             // Setup the items
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom
             {
@@ -1066,10 +948,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             // Setup the items
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom
             {
@@ -1113,10 +992,7 @@ namespace SabreTools.Metadata.DatFiles.Test
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom
             {

SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs

@@ -16,8 +16,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem disk = new Disk();
+            DatItem disk = new Disk { Name = "item" };
-            disk.SetName("item");
             disk.Write<string?>(Data.Models.Metadata.Disk.SHA1Key, "deadbeef");
             disk.Source = source;
             disk.Machine = machine;
@@ -37,10 +36,12 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem disk = new Disk();
+            DatItem disk = new Disk
-            disk.SetName("item");
+            {
-            disk.Source = source;
+                Name = "item",
-            disk.Machine = machine;
+                Source = source,
+                Machine = machine
+            };
 
             var dict = new ItemDictionary();
             _ = dict.AddItem(disk, statsOnly: false);
@@ -57,11 +58,13 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            var file = new File();
+            var file = new File
+            {
+                SHA1 = "deadbeef",
+                Source = source,
+                Machine = machine
+            };
             file.SetName("item");
-            file.SHA1 = "deadbeef";
-            file.Source = source;
-            file.Machine = machine;
 
             var dict = new ItemDictionary();
             _ = dict.AddItem(file, statsOnly: false);
@@ -77,10 +80,12 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem file = new File();
+            DatItem file = new File
+            {
+                Source = source,
+                Machine = machine
+            };
             file.SetName("item");
-            file.Source = source;
-            file.Machine = machine;
 
             var dict = new ItemDictionary();
             _ = dict.AddItem(file, statsOnly: false);
@@ -96,10 +101,13 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem media = new Media() { SHA1 = "deadbeef" };
+            DatItem media = new Media
-            media.SetName("item");
+            {
-            media.Source = source;
+                Name = "item",
-            media.Machine = machine;
+                SHA1 = "deadbeef",
+                Source = source,
+                Machine = machine
+            };
 
             var dict = new ItemDictionary();
             _ = dict.AddItem(media, statsOnly: false);
@@ -115,10 +123,12 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem media = new Media();
+            DatItem media = new Media
-            media.SetName("item");
+            {
-            media.Source = source;
+                Name = "item",
-            media.Machine = machine;
+                Source = source,
+                Machine = machine
+            };
 
             var dict = new ItemDictionary();
             _ = dict.AddItem(media, statsOnly: false);
@@ -185,10 +195,7 @@ namespace SabreTools.Metadata.DatFiles.Test
             Source source = new Source(0, source: null);
             Machine machine = new Machine();
 
-            DatItem rom = new Rom
+            DatItem rom = new Rom { Name = "item" };
-            {
-                Name = "item"
-            };
             rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
             rom.Source = source;
             rom.Machine = machine;
@@ -274,25 +281,22 @@ namespace SabreTools.Metadata.DatFiles.Test
         public void ClearMarkedTest()
         {
             // Setup the items
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom
-{
+            {
-Name = "rom-1",
+                Name = "rom-1",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom1.CopyMachineInformation(machine);
 
             DatItem rom2 = new Rom
-{
+            {
-Name = "rom-2",
+                Name = "rom-2",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             rom2.RemoveFlag = true;
             rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
@@ -318,10 +322,7 @@ Size = 1024,
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom
             {
@@ -342,10 +343,7 @@ Size = 1024,
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom
             {
@@ -366,10 +364,7 @@ Size = 1024,
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom
             {
@@ -391,10 +386,7 @@ Size = 1024,
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom
             {
@@ -416,10 +408,7 @@ Size = 1024,
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom
             {
@@ -442,13 +431,13 @@ Size = 1024,
         [Fact]
         public void RemoveBucketTest()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
-            DatItem datItem = new Rom() { Size = 1024 };
+            DatItem datItem = new Rom
-            datItem.SetName("rom-1");
+            {
+                Size = 1024,
+                Name = "rom-1"
+            };
             datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             datItem.CopyMachineInformation(machine);
@@ -469,13 +458,13 @@ Size = 1024,
         [Fact]
         public void RemoveItemTest()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
-            DatItem datItem = new Rom() { Size = 1024 };
+            DatItem datItem = new Rom
-            datItem.SetName("rom-1");
+            {
+                Size = 1024,
+                Name = "rom-1"
+            };
             datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             datItem.CopyMachineInformation(machine);
@@ -501,48 +490,42 @@ Size = 1024,
         public void BucketByTest(ItemKey itemKey, int expected)
         {
             // Setup the items
-            Machine machine1 = new Machine
+            Machine machine1 = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
-            Machine machine2 = new Machine
+            Machine machine2 = new Machine { Name = "game-2" };
-            {
-                Name = "game-2"
-            };
 
             DatItem rom1 = new Rom
-{
+            {
-Name = "rom-1",
+                Name = "rom-1",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom1.CopyMachineInformation(machine1);
 
             DatItem rom2 = new Rom
-{
+            {
-Name = "rom-2",
+                Name = "rom-2",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
             rom1.CopyMachineInformation(machine1);
 
             DatItem rom3 = new Rom
-{
+            {
-Name = "rom-3",
+                Name = "rom-3",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom3.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             rom3.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
             rom1.CopyMachineInformation(machine2);
 
             DatItem rom4 = new Rom
-{
+            {
-Name = "rom-4",
+                Name = "rom-4",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom4.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
             rom4.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
             rom1.CopyMachineInformation(machine2);
@@ -566,24 +549,21 @@ Size = 1024,
         public void DeduplicateTest()
         {
             // Setup the items
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom
-{
+            {
-Name = "rom-1",
+                Name = "rom-1",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom1.CopyMachineInformation(machine);
 
             DatItem rom2 = new Rom
-{
+            {
-Name = "rom-2",
+                Name = "rom-2",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom2.CopyMachineInformation(machine);
 
@@ -625,28 +605,16 @@ Size = 1024,
         {
             var dict = new ItemDictionary();
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
             romA.Source = new Source(0);
             romA.CopyMachineInformation(machineA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romB.Source = new Source(1);
             romB.CopyMachineInformation(machineB);
@@ -660,28 +628,16 @@ Size = 1024,
         {
             var dict = new ItemDictionary();
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romA.Source = new Source(0);
             romA.CopyMachineInformation(machineA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romB.Source = new Source(1);
             romB.CopyMachineInformation(machineB);
@@ -695,28 +651,16 @@ Size = 1024,
         {
             var dict = new ItemDictionary();
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "not-name-same" };
-            {
-                Name = "not-name-same"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romA.Source = new Source(0);
             romA.CopyMachineInformation(machineA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romB.Source = new Source(1);
             romB.CopyMachineInformation(machineB);
@@ -730,28 +674,16 @@ Size = 1024,
         {
             var dict = new ItemDictionary();
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romA.Source = new Source(0);
             romA.CopyMachineInformation(machineA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romB.Source = new Source(0);
             romB.CopyMachineInformation(machineB);
@@ -765,28 +697,16 @@ Size = 1024,
         {
             var dict = new ItemDictionary();
 
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "name-same" };
-            {
-                Name = "name-same"
-            };
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "not-name-same" };
-            {
-                Name = "not-name-same"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romA.Source = new Source(0);
             romA.CopyMachineInformation(machineA);
 
-            var romB = new Rom
+            var romB = new Rom { Name = "same-name" };
-            {
-                Name = "same-name"
-            };
             romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
             romB.Source = new Source(0);
             romB.CopyMachineInformation(machineB);
@@ -805,24 +725,21 @@ Size = 1024,
         public void GetDuplicatesTest(bool hasDuplicate, int expected)
         {
             // Setup the items
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom
-{
+            {
-Name = "rom-1",
+                Name = "rom-1",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom1.CopyMachineInformation(machine);
 
             DatItem rom2 = new Rom
-{
+            {
-Name = "rom-2",
+                Name = "rom-2",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
             rom2.CopyMachineInformation(machine);
 
@@ -833,10 +750,10 @@ Size = 1024,
 
             // Setup the test item
             DatItem rom = new Rom
-{
+            {
-Name = "rom-1",
+                Name = "rom-1",
-Size = hasDuplicate ? 1024 : 2048,
+                Size = hasDuplicate ? 1024 : 2048,
-};
+            };
             rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom.CopyMachineInformation(machine);
 
@@ -854,24 +771,21 @@ Size = hasDuplicate ? 1024 : 2048,
         public void HasDuplicatesTest(bool expected)
         {
             // Setup the items
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "game-1" };
-            {
-                Name = "game-1"
-            };
 
             DatItem rom1 = new Rom
-{
+            {
-Name = "rom-1",
+                Name = "rom-1",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom1.CopyMachineInformation(machine);
 
             DatItem rom2 = new Rom
-{
+            {
-Name = "rom-2",
+                Name = "rom-2",
-Size = 1024,
+                Size = 1024,
-};
+            };
             rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
             rom1.CopyMachineInformation(machine);
 
@@ -882,10 +796,10 @@ Size = 1024,
 
             // Setup the test item
             DatItem rom = new Rom
-{
+            {
-Name = "rom-1",
+                Name = "rom-1",
-Size = expected ? 1024 : 2048,
+                Size = expected ? 1024 : 2048,
-};
+            };
             rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
             rom1.CopyMachineInformation(machine);
 
@@ -902,16 +816,13 @@ Size = expected ? 1024 : 2048,
         {
             Source source = new Source(0, source: null);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "machine" };
-            {
-                Name = "machine"
-            };
 
             DatItem item = new Rom
-{
+            {
-Name = "rom",
+                Name = "rom",
-Size = 12345,
+                Size = 12345,
-};
+            };
             item.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
             item.Source = source;
             item.Machine = machine;

SabreTools.Metadata.DatFiles/DatFile.cs

@@ -507,7 +507,7 @@ namespace SabreTools.Metadata.DatFiles
                     if (!string.IsNullOrEmpty(sha1))
                     {
                         name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
-                        item.SetName($"{pre}{name}{post}");
+                        disk.Name = $"{pre}{name}{post}";
                     }
                 }
                 else if (item is DatItems.Formats.File file)
@@ -517,7 +517,7 @@ namespace SabreTools.Metadata.DatFiles
                     if (!string.IsNullOrEmpty(sha1))
                     {
                         name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
-                        item.SetName($"{pre}{name}{post}");
+                        file.SetName($"{pre}{name}{post}");
                     }
                 }
                 else if (item is Media media)
@@ -527,7 +527,7 @@ namespace SabreTools.Metadata.DatFiles
                     if (!string.IsNullOrEmpty(sha1))
                     {
                         name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
-                        item.SetName($"{pre}{name}{post}");
+                        media.Name = $"{pre}{name}{post}";
                     }
                 }
                 else if (item is Rom rom)
@@ -537,7 +537,7 @@ namespace SabreTools.Metadata.DatFiles
                     if (!string.IsNullOrEmpty(sha1))
                     {
                         name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
-                        item.SetName($"{pre}{name}{post}");
+                        rom.Name = $"{pre}{name}{post}";
                     }
                 }
 

SabreTools.Metadata.DatFiles/Formats/Missfile.cs

@@ -206,7 +206,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
             if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName)
                 sw.Write($"{datItem.GetName() ?? string.Empty}\n");
             else if (!Modifiers.UseRomName && machine!.Name != lastgame)
-                sw.Write($"{machine!.GetName() ?? string.Empty}\n");
+                sw.Write($"{machine!.Name ?? string.Empty}\n");
 
             sw.Flush();
         }

SabreTools.Metadata.DatItems.Test/DatItemTests.cs

@@ -55,10 +55,7 @@ namespace SabreTools.Metadata.DatItems.Test
         {
             var romA = new Rom();
 
-            var romB = new Rom
+            var romB = new Rom { Machine = null };
-            {
-                Machine = null
-            };
 
             romA.CopyMachineInformation(romB);
             var actualMachineA = romA.Machine;
@@ -69,20 +66,11 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CopyMachineInformation_EmptyItem_NoChange()
         {
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "machineA" };
-            {
-                Name = "machineA"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Machine = machineA };
-            {
-                Machine = machineA
-            };
 
-            var romB = new Rom
+            var romB = new Rom { Machine = null };
-            {
-                Machine = null
-            };
 
             romA.CopyMachineInformation(romB);
             var actualMachineA = romA.Machine;
@@ -93,22 +81,13 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CopyMachineInformation_NullMachine_NoChange()
         {
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "machineA" };
-            {
-                Name = "machineA"
-            };
 
             Machine? machineB = null;
 
-            var romA = new Rom
+            var romA = new Rom { Machine = machineA };
-            {
-                Machine = machineA
-            };
 
-            var romB = new Rom
+            var romB = new Rom { Machine = machineB };
-            {
-                Machine = machineB
-            };
 
             romA.CopyMachineInformation(romB);
             var actualMachineA = romA.Machine;
@@ -119,22 +98,13 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CopyMachineInformation_EmptyMachine_Overwrite()
         {
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "machineA" };
-            {
-                Name = "machineA"
-            };
 
             Machine? machineB = new Machine();
 
-            var romA = new Rom
+            var romA = new Rom { Machine = machineA };
-            {
-                Machine = machineA
-            };
 
-            var romB = new Rom
+            var romB = new Rom { Machine = machineB };
-            {
-                Machine = machineB
-            };
 
             romA.CopyMachineInformation(romB);
             var actualMachineA = romA.Machine;
@@ -145,25 +115,13 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CopyMachineInformation_FilledMachine_Overwrite()
         {
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "machineA" };
-            {
-                Name = "machineA"
-            };
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "machineB" };
-            {
-                Name = "machineB"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Machine = machineA };
-            {
-                Machine = machineA
-            };
 
-            var romB = new Rom
+            var romB = new Rom { Machine = machineB };
-            {
-                Machine = machineB
-            };
 
             romA.CopyMachineInformation(romB);
             var actualMachineA = romA.Machine;
@@ -174,25 +132,13 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CopyMachineInformation_MismatchedType_Overwrite()
         {
-            Machine? machineA = new Machine
+            Machine? machineA = new Machine { Name = "machineA" };
-            {
-                Name = "machineA"
-            };
 
-            Machine? machineB = new Machine
+            Machine? machineB = new Machine { Name = "machineB" };
-            {
-                Name = "machineB"
-            };
 
-            var romA = new Rom
+            var romA = new Rom { Machine = machineA };
-            {
-                Machine = machineA
-            };
 
-            var diskB = new Disk
+            var diskB = new Disk { Machine = machineB };
-            {
-                Machine = machineB
-            };
 
             romA.CopyMachineInformation(diskB);
             var actualMachineA = romA.Machine;
@@ -217,11 +163,9 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CompareTo_DifferentOther_Returns1()
         {
-            DatItem self = new Rom();
+            DatItem self = new Rom { Name = "name" };
-            self.SetName("name");
 
-            DatItem? other = new Disk();
+            DatItem? other = new Disk { Name = "name" };
-            other.SetName("name");
 
             int actual = self.CompareTo(other);
             Assert.Equal(1, actual);
@@ -246,12 +190,10 @@ namespace SabreTools.Metadata.DatItems.Test
         [InlineData("name", "name", 0)]
         public void CompareTo_NamesOnly(string? selfName, string? otherName, int expected)
         {
-            DatItem self = new Rom();
+            DatItem self = new Rom { Name = selfName };
-            self.SetName(selfName);
             self.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
 
-            DatItem? other = new Rom();
+            DatItem? other = new Rom { Name = otherName };
-            other.SetName(otherName);
             other.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
 
             int actual = self.CompareTo(other);
@@ -388,10 +330,7 @@ namespace SabreTools.Metadata.DatItems.Test
         {
             Source source = new Source(0);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "Machine" };
-            {
-                Name = "Machine"
-            };
 
             DatItem datItem = new Blank();
 
@@ -464,10 +403,7 @@ namespace SabreTools.Metadata.DatItems.Test
         {
             Source source = new Source(0);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "Machine" };
-            {
-                Name = "Machine"
-            };
 
             DatItem datItem = new Rom();
             datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");
@@ -573,15 +509,12 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CloneTest()
         {
-            DatItem item = new Sample
+            DatItem item = new Sample { Name = "name" };
-            {
-                Name = "name"
-            };
 
             object clone = item.Clone();
             Sample? actual = clone as Sample;
             Assert.NotNull(actual);
-            Assert.Equal("name", actual.GetName());
+            Assert.Equal("name", actual.Name);
         }
 
         #endregion

SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs

@@ -15,10 +15,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
                 Name = "name"
             };
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "name" };
-            {
-                Name = "name"
-            };
 
             Part part = new Part
             {
@@ -27,10 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
 
             Source source = new Source(0, "XXXXXX");
 
-            Disk disk = new Disk
+            Disk disk = new Disk { Name = "name" };
-            {
-                Name = "name"
-            };
             disk.Write(Disk.DiskAreaKey, diskArea);
             disk.Write(Data.Models.Metadata.Disk.MergeKey, "XXXXXX");
             disk.Write(Data.Models.Metadata.Disk.RegionKey, "XXXXXX");
@@ -261,10 +255,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
         {
             Source source = new Source(0);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "Machine" };
-            {
-                Name = "Machine"
-            };
 
             DatItem datItem = new Disk();
             datItem.Write(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF");

SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs

@@ -10,10 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
         [Fact]
         public void ConvertToRomTest()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "name" };
-            {
-                Name = "name"
-            };
 
             Source source = new Source(0, "XXXXXX");
 
@@ -37,7 +34,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
 
             Rom actual = file.ConvertToRom();
 
-            Assert.Equal("XXXXXX.XXXXXX", actual.GetName());
+            Assert.Equal("XXXXXX.XXXXXX", actual.Name);
             Assert.Equal(12345, actual.Size);
             Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.CRCKey));
             Assert.Equal("000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
@@ -47,7 +44,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
 
             Machine? actualMachine = actual.Machine;
             Assert.NotNull(actualMachine);
-            Assert.Equal("name", actualMachine.GetName());
+            Assert.Equal("name", actualMachine.Name);
 
             Assert.False(actual.RemoveFlag);
 
@@ -342,10 +339,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
         {
             Source source = new Source(0);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "Machine" };
-            {
-                Name = "Machine"
-            };
 
             DatItem datItem = new File
             {

SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs

@@ -10,10 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
         [Fact]
         public void ConvertToRomTest()
         {
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "name" };
-            {
-                Name = "name"
-            };
 
             Source source = new Source(0, "XXXXXX");
 
@@ -333,10 +330,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
         {
             Source source = new Source(0);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "Machine" };
-            {
-                Name = "Machine"
-            };
 
             DatItem datItem = new Media
             {

SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs

@@ -799,10 +799,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
         {
             Source source = new Source(0);
 
-            Machine machine = new Machine
+            Machine machine = new Machine { Name = "Machine" };
-            {
-                Name = "Machine"
-            };
 
             DatItem datItem = new Rom();
             datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");

SabreTools.Metadata.DatItems.Test/MachineTests.cs

@@ -9,10 +9,7 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void CloneTest()
         {
-            Machine item = new Machine
+            Machine item = new Machine { Name = "name" };
-            {
-                Name = "name"
-            };
 
             object clone = item.Clone();
             Machine? actual = clone as Machine;
@@ -27,10 +24,7 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void GetInternalCloneTest()
         {
-            Machine item = new Machine
+            Machine item = new Machine { Name = "name" };
-            {
-                Name = "name"
-            };
 
             Data.Models.Metadata.Machine actual = item.GetInternalClone();
             Assert.Equal("name", actual.Name);
@@ -63,15 +57,9 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void Equals_MismatchedInternal_False()
         {
-            Machine self = new Machine
+            Machine self = new Machine { Name = "self" };
-            {
-                Name = "self"
-            };
 
-            Machine? other = new Machine
+            Machine? other = new Machine { Name = "other" };
-            {
-                Name = "other"
-            };
 
             bool actual = self.Equals(other);
             Assert.False(actual);
@@ -80,15 +68,9 @@ namespace SabreTools.Metadata.DatItems.Test
         [Fact]
         public void Equals_EqualInternal_True()
         {
-            Machine self = new Machine
+            Machine self = new Machine { Name = "name" };
-            {
-                Name = "name"
-            };
 
-            Machine? other = new Machine
+            Machine? other = new Machine { Name = "name" };
-            {
-                Name = "name"
-            };
 
             bool actual = self.Equals(other);
             Assert.True(actual);

SabreTools.Metadata.Test/DictionaryBaseExtensionsTests.cs

@@ -1068,10 +1068,7 @@ namespace SabreTools.Metadata.Test
         [Fact]
         public void EqualTo_Other_MismatchedCount_False()
         {
-            DictionaryBase self = new Sample
+            DictionaryBase self = new Sample { ["KEY1"] = "XXXXXX", };
-            {
-                ["KEY1"] = "XXXXXX",
-            };
             DictionaryBase other = new Sample
             {
                 ["KEY1"] = "XXXXXX",
@@ -1085,14 +1082,8 @@ namespace SabreTools.Metadata.Test
         [Fact]
         public void EqualTo_Other_MismatchedKeys_False()
         {
-            DictionaryBase self = new Sample
+            DictionaryBase self = new Sample { ["KEY1"] = "XXXXXX", };
-            {
+            DictionaryBase other = new Sample { ["KEY2"] = "XXXXXX", };
-                ["KEY1"] = "XXXXXX",
-            };
-            DictionaryBase other = new Sample
-            {
-                ["KEY2"] = "XXXXXX",
-            };
 
             bool actual = self.EqualTo(other);
             Assert.False(actual);
@@ -1101,14 +1092,8 @@ namespace SabreTools.Metadata.Test
         [Fact]
         public void EqualTo_Other_MismatchedValues_False()
         {
-            DictionaryBase self = new Sample
+            DictionaryBase self = new Sample { ["KEY1"] = "XXXXXX", };
-            {
+            DictionaryBase other = new Sample { ["KEY1"] = "ZZZZZZ", };
-                ["KEY1"] = "XXXXXX",
-            };
-            DictionaryBase other = new Sample
-            {
-                ["KEY1"] = "ZZZZZZ",
-            };
 
             bool actual = self.EqualTo(other);
             Assert.False(actual);
@@ -1117,14 +1102,8 @@ namespace SabreTools.Metadata.Test
         [Fact]
         public void EqualTo_Other_Matching_True()
         {
-            DictionaryBase self = new Sample
+            DictionaryBase self = new Sample { ["KEY1"] = "XXXXXX", };
-            {
+            DictionaryBase other = new Sample { ["KEY1"] = "XXXXXX", };
-                ["KEY1"] = "XXXXXX",
-            };
-            DictionaryBase other = new Sample
-            {
-                ["KEY1"] = "XXXXXX",
-            };
 
             bool actual = self.EqualTo(other);
             Assert.True(actual);

SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs

@@ -314,10 +314,7 @@ namespace SabreTools.Serialization.CrossModel
         /// </summary>
         private static Sample ConvertFromInternalModel(Data.Models.Metadata.Sample item)
         {
-            var sample = new Sample
+            var sample = new Sample { Name = item.Name, };
-            {
-                Name = item.Name,
-            };
             return sample;
         }
 

SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs

@@ -583,10 +583,7 @@ namespace SabreTools.Serialization.CrossModel
         /// </summary>
         private static Sample ConvertFromInternalModel(Data.Models.Metadata.Sample item)
         {
-            var sample = new Sample
+            var sample = new Sample { Name = item.Name, };
-            {
-                Name = item.Name,
-            };
             return sample;
         }
 

SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs

@@ -333,10 +333,7 @@ namespace SabreTools.Serialization.CrossModel
         /// </summary>
         private static Sample ConvertFromInternalModel(Data.Models.Metadata.Sample item)
         {
-            var sample = new Sample
+            var sample = new Sample { Name = item.Name, };
-            {
-                Name = item.Name,
-            };
             return sample;
         }
 

SabreTools.Serialization.Readers/ClrMamePro.cs

@@ -309,10 +309,7 @@ namespace SabreTools.Serialization.Readers
                                 game.SampleOf = reader.Standalone?.Value;
                                 break;
                             case "sample":
-                                var sample = new Sample
+                                var sample = new Sample { Name = reader.Standalone?.Value ?? string.Empty, };
-                                {
-                                    Name = reader.Standalone?.Value ?? string.Empty,
-                                };
                                 samples.Add(sample);
                                 break;
                             default: