diff --git a/SabreTools.Metadata.DatFiles/DatFile.cs b/SabreTools.Metadata.DatFiles/DatFile.cs
index ec283bcf..11818383 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.cs
@@ -821,7 +821,6 @@ namespace SabreTools.Metadata.DatFiles
 
                     // Set the item name back to the datItem
                     datItem.SetName(datItemName);
-
                     output.Add(datItem);
                 }
 
diff --git a/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs b/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs
index 61578ef7..7b6747cb 100644
--- a/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/AttractMode.cs
@@ -28,9 +28,17 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
+            switch (datItem)
+            {
+                case DatItems.Formats.Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
+                    break;
+
+                default:
+                    // Item type is not supported
+                    break;
+            }
 
             return missingFields;
         }
diff --git a/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs b/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
index ecc5cd01..2c46c17f 100644
--- a/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
@@ -29,13 +29,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (rom.Size is null || rom.Size < 0)
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
                     // if (string.IsNullOrEmpty(rom.Date))
diff --git a/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs b/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
index b40adf19..24ea93de 100644
--- a/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
@@ -29,13 +29,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.SHA256))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA256));
                     if (string.IsNullOrEmpty(rom.SHA1))
diff --git a/SabreTools.Metadata.DatFiles/Formats/Listrom.cs b/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
index 05d822e8..01a6e4fe 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
@@ -30,13 +30,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Disk disk:
+                    if (string.IsNullOrEmpty(disk.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     if (string.IsNullOrEmpty(disk.MD5)
                         && string.IsNullOrEmpty(disk.SHA1))
                     {
@@ -46,6 +44,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
                     break;
 
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (rom.Size is null || rom.Size < 0)
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
                     if (string.IsNullOrEmpty(rom.CRC))
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md2File.cs b/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
index 72c9a1be..53f7b99b 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
@@ -31,13 +31,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.MD2))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.MD2));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md4File.cs b/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
index 52b0ce11..953954b3 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
@@ -31,13 +31,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.MD4))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.MD4));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md5File.cs b/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
index b9dcf6ff..8bac1e5c 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
@@ -33,23 +33,25 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Disk disk:
+                    if (string.IsNullOrEmpty(disk.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     if (string.IsNullOrEmpty(disk.MD5))
                         missingFields.Add(nameof(Data.Models.Metadata.Disk.MD5));
                     break;
 
                 case Media medium:
+                    if (string.IsNullOrEmpty(medium.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Media.Name));
                     if (string.IsNullOrEmpty(medium.MD5))
                         missingFields.Add(nameof(Data.Models.Metadata.Media.MD5));
                     break;
 
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.MD5))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.MD5));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
index 7924f589..04b72f91 100644
--- a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
@@ -68,13 +68,11 @@ The softwaredb.xml file contains information about rom mapper types
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.SHA1))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs b/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
index 4611ecf1..6dff13cb 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
@@ -31,13 +31,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.RIPEMD128))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.RIPEMD128));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs b/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
index a42e39e8..d0226012 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
@@ -31,13 +31,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.RIPEMD160))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.RIPEMD160));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs b/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
index a07d6860..ec4436e6 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
@@ -29,13 +29,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.CRC))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
                     if (rom.Size is null || rom.Size < 0)
diff --git a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
index 385331a7..d7f5a781 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
@@ -66,13 +66,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Disk disk:
+                    if (string.IsNullOrEmpty(disk.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     if (string.IsNullOrEmpty(disk.MD5)
                         && string.IsNullOrEmpty(disk.SHA1))
                     {
@@ -81,11 +79,13 @@ namespace SabreTools.Metadata.DatFiles.Formats
 
                     break;
 
-                case Media media:
-                    if (string.IsNullOrEmpty(media.MD5)
-                        && string.IsNullOrEmpty(media.SHA1)
-                        && string.IsNullOrEmpty(media.SHA256)
-                        && string.IsNullOrEmpty(media.SpamSum))
+                case Media medium:
+                    if (string.IsNullOrEmpty(medium.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Media.Name));
+                    if (string.IsNullOrEmpty(medium.MD5)
+                        && string.IsNullOrEmpty(medium.SHA1)
+                        && string.IsNullOrEmpty(medium.SHA256)
+                        && string.IsNullOrEmpty(medium.SpamSum))
                     {
                         missingFields.Add(nameof(Data.Models.Metadata.Media.SHA1));
                     }
@@ -93,6 +93,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
                     break;
 
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (rom.Size is null || rom.Size < 0)
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
                     if (string.IsNullOrEmpty(rom.CRC)
diff --git a/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs b/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
index 6994ecc6..dedb10c9 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
@@ -31,13 +31,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.CRC))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
index f602f8cd..e3f04441 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
@@ -33,23 +33,25 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Disk disk:
+                    if (string.IsNullOrEmpty(disk.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Disk.Name));
                     if (string.IsNullOrEmpty(disk.SHA1))
                         missingFields.Add(nameof(Data.Models.Metadata.Disk.SHA1));
                     break;
 
                 case Media medium:
+                    if (string.IsNullOrEmpty(medium.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Media.Name));
                     if (string.IsNullOrEmpty(medium.SHA1))
                         missingFields.Add(nameof(Data.Models.Metadata.Media.SHA1));
                     break;
 
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.SHA1))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
index 53f4c750..06005494 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
@@ -32,18 +32,18 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Media medium:
+                    if (string.IsNullOrEmpty(medium.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Media.Name));
                     if (string.IsNullOrEmpty(medium.SHA256))
                         missingFields.Add(nameof(Data.Models.Metadata.Media.SHA256));
                     break;
 
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.SHA256))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA256));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
index 8b8cada1..29b032e3 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
@@ -31,13 +31,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.SHA384))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA384));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
index 1fb4f576..8865c4da 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
@@ -31,13 +31,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.SHA512))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA512));
                     break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs b/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
index 73407a22..adb97965 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
@@ -32,18 +32,18 @@ namespace SabreTools.Metadata.DatFiles.Formats
         {
             List<string> missingFields = [];
 
-            // Check item name
-            if (string.IsNullOrEmpty(datItem.GetName()))
-                missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
-
             switch (datItem)
             {
                 case Media medium:
+                    if (string.IsNullOrEmpty(medium.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Media.Name));
                     if (string.IsNullOrEmpty(medium.SpamSum))
                         missingFields.Add(nameof(Data.Models.Metadata.Media.SpamSum));
                     break;
 
                 case Rom rom:
+                    if (string.IsNullOrEmpty(rom.Name))
+                        missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
                     if (string.IsNullOrEmpty(rom.SpamSum))
                         missingFields.Add(nameof(Data.Models.Metadata.Rom.SpamSum));
                     break;