diff --git a/SabreTools.Serialization/AttractMode.cs b/SabreTools.Serialization/AttractMode.cs
index e718c728..24743cf6 100644
--- a/SabreTools.Serialization/AttractMode.cs
+++ b/SabreTools.Serialization/AttractMode.cs
@@ -23,7 +23,7 @@ namespace SabreTools.Serialization
         /// </summary>
         /// <param name="path">Path to the file to deserialize</param>
         /// <returns>Deserialized data on success, null on failure</returns>
-        public static Dat? Deserialize(string path)
+        public static MetadataFile? Deserialize(string path)
         {
             try
             {
@@ -42,7 +42,7 @@ namespace SabreTools.Serialization
         /// </summary>
         /// <param name="stream">Stream to deserialize</param>
         /// <returns>Deserialized data on success, null on failure</returns>
-        public static Dat? Deserialize(Stream? stream)
+        public static MetadataFile? Deserialize(Stream? stream)
         {
             try
             {
@@ -56,7 +56,7 @@ namespace SabreTools.Serialization
                     Separator = ';',
                     VerifyFieldCount = false,
                 };
-                var dat = new Dat();
+                var dat = new MetadataFile();
 
                 // Read the header values first
                 if (!reader.ReadHeader())
diff --git a/SabreTools.Serialization/EverdriveSMDB.cs b/SabreTools.Serialization/EverdriveSMDB.cs
index 1be2f4c4..27e5756a 100644
--- a/SabreTools.Serialization/EverdriveSMDB.cs
+++ b/SabreTools.Serialization/EverdriveSMDB.cs
@@ -17,7 +17,7 @@ namespace SabreTools.Serialization
         /// </summary>
         /// <param name="path">Path to the file to deserialize</param>
         /// <returns>Deserialized data on success, null on failure</returns>
-        public static Dat? Deserialize(string path)
+        public static MetadataFile? Deserialize(string path)
         {
             try
             {
@@ -36,7 +36,7 @@ namespace SabreTools.Serialization
         /// </summary>
         /// <param name="stream">Stream to deserialize</param>
         /// <returns>Deserialized data on success, null on failure</returns>
-        public static Dat? Deserialize(Stream? stream)
+        public static MetadataFile? Deserialize(Stream? stream)
         {
             try
             {
@@ -51,7 +51,7 @@ namespace SabreTools.Serialization
                     Separator = '\t',
                     VerifyFieldCount = false,
                 };
-                var dat = new Dat();
+                var dat = new MetadataFile();
 
                 // Loop through the rows and parse out values
                 var rows = new List<Row>();
diff --git a/SabreTools.Serialization/Listrom.cs b/SabreTools.Serialization/Listrom.cs
index 82f9654e..ced6e48d 100644
--- a/SabreTools.Serialization/Listrom.cs
+++ b/SabreTools.Serialization/Listrom.cs
@@ -16,7 +16,7 @@ namespace SabreTools.Serialization
         /// </summary>
         /// <param name="path">Path to the file to deserialize</param>
         /// <returns>Deserialized data on success, null on failure</returns>
-        public static Dat? Deserialize(string path)
+        public static MetadataFile? Deserialize(string path)
         {
             try
             {
@@ -35,7 +35,7 @@ namespace SabreTools.Serialization
         /// </summary>
         /// <param name="stream">Stream to deserialize</param>
         /// <returns>Deserialized data on success, null on failure</returns>
-        public static Dat? Deserialize(Stream? stream)
+        public static MetadataFile? Deserialize(Stream? stream)
         {
             try
             {
@@ -45,7 +45,7 @@ namespace SabreTools.Serialization
 
                 // Setup the reader and output
                 var reader = new StreamReader(stream, Encoding.UTF8);
-                var dat = new Dat();
+                var dat = new MetadataFile();
 
                 Set? set = null;
                 var sets = new List<Set?>();