diff --git a/SabreTools.Serialization/Internal.ArchiveDotOrg.cs b/SabreTools.Serialization/Internal.ArchiveDotOrg.cs
index 80dc56e8..0af815af 100644
--- a/SabreTools.Serialization/Internal.ArchiveDotOrg.cs
+++ b/SabreTools.Serialization/Internal.ArchiveDotOrg.cs
@@ -13,15 +13,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ArchiveDotOrg.Files"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromArchiveDotOrg(Models.ArchiveDotOrg.Files item)
+        public static MetadataFile ConvertToInternalModel(Models.ArchiveDotOrg.Files item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromArchiveDotOrg(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.File != null && item.File.Any())
-                metadataFile[MetadataFile.MachineKey] = item.File.Select(ConvertMachineFromArchiveDotOrg).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.File.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -29,7 +29,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ArchiveDotOrg.Files"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromArchiveDotOrg(Models.ArchiveDotOrg.Files item)
+        private static Header ConvertHeaderToInternalModel(Models.ArchiveDotOrg.Files item)
         {
             var header = new Header
             {
@@ -41,11 +41,11 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
+        private static Machine ConvertMachineToInternalModel(Models.ArchiveDotOrg.File item)
         {
             var machine = new Machine
             {
-                [Machine.RomKey] = ConvertFromArchiveDotOrg(item),
+                [Machine.RomKey] = ConvertToInternalModel(item),
             };
             return machine;
         }
@@ -53,7 +53,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
+        private static Rom ConvertToInternalModel(Models.ArchiveDotOrg.File item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.AttractMode.cs b/SabreTools.Serialization/Internal.AttractMode.cs
index bda2f846..5d7a75b6 100644
--- a/SabreTools.Serialization/Internal.AttractMode.cs
+++ b/SabreTools.Serialization/Internal.AttractMode.cs
@@ -13,15 +13,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.AttractMode.MetadataFile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromAttractMode(Models.AttractMode.MetadataFile item)
+        public static MetadataFile ConvertToInternalModel(Models.AttractMode.MetadataFile item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromAttractMode(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Row != null && item.Row.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Row.Select(ConvertMachineFromAttractMode).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Row.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -29,7 +29,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.AttractMode.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromAttractMode(Models.AttractMode.MetadataFile item)
+        private static Header ConvertHeaderToInternalModel(Models.AttractMode.MetadataFile item)
         {
             var header = new Header
             {
@@ -41,7 +41,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromAttractMode(Models.AttractMode.Row item)
+        private static Machine ConvertMachineToInternalModel(Models.AttractMode.Row item)
         {
             var machine = new Machine
             {
@@ -64,7 +64,7 @@ namespace SabreTools.Serialization
                 [Machine.PlayedCountKey] = item.PlayedCount,
                 [Machine.PlayedTimeKey] = item.PlayedTime,
                 [Machine.PlayedTimeKey] = item.PlayedTime,
-                [Machine.RomKey] = ConvertFromAttractMode(item),
+                [Machine.RomKey] = ConvertToInternalModel(item),
             };
             return machine;
         }
@@ -72,7 +72,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromAttractMode(Models.AttractMode.Row item)
+        private static Rom ConvertToInternalModel(Models.AttractMode.Row item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.ClrMamePro.cs b/SabreTools.Serialization/Internal.ClrMamePro.cs
index 09e531e5..d09a7a1f 100644
--- a/SabreTools.Serialization/Internal.ClrMamePro.cs
+++ b/SabreTools.Serialization/Internal.ClrMamePro.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.MetadataFile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromClrMamePro(Models.ClrMamePro.MetadataFile item)
+        public static MetadataFile ConvertToInternalModel(Models.ClrMamePro.MetadataFile item)
         {
             var metadataFile = new MetadataFile();
 
             if (item?.ClrMamePro != null)
-                metadataFile[MetadataFile.HeaderKey] = ConvertHeaderFromClrMamePro(item.ClrMamePro);
+                metadataFile[MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.ClrMamePro);
 
             if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineFromClrMamePro).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,7 +30,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.ClrMamePro"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromClrMamePro(Models.ClrMamePro.ClrMamePro item)
+        private static Header ConvertHeaderToInternalModel(Models.ClrMamePro.ClrMamePro item)
         {
             var header = new Header
             {
@@ -56,7 +56,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromClrMamePro(Models.ClrMamePro.GameBase item)
+        private static Machine ConvertMachineToInternalModel(Models.ClrMamePro.GameBase item)
         {
             var machine = new Machine
             {
@@ -75,7 +75,7 @@ namespace SabreTools.Serialization
                 var releases = new List<Release>();
                 foreach (var release in item.Release)
                 {
-                    releases.Add(ConvertFromClrMamePro(release));
+                    releases.Add(ConvertToInternalModel(release));
                 }
                 machine[Machine.ReleaseKey] = releases.ToArray();
             }
@@ -85,7 +85,7 @@ namespace SabreTools.Serialization
                 var biosSets = new List<BiosSet>();
                 foreach (var biosSet in item.BiosSet)
                 {
-                    biosSets.Add(ConvertFromClrMamePro(biosSet));
+                    biosSets.Add(ConvertToInternalModel(biosSet));
                 }
                 machine[Machine.BiosSetKey] = biosSets.ToArray();
             }
@@ -95,7 +95,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
-                    roms.Add(ConvertFromClrMamePro(rom));
+                    roms.Add(ConvertToInternalModel(rom));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -105,7 +105,7 @@ namespace SabreTools.Serialization
                 var disks = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
-                    disks.Add(ConvertFromClrMamePro(disk));
+                    disks.Add(ConvertToInternalModel(disk));
                 }
                 machine[Machine.DiskKey] = disks.ToArray();
             }
@@ -115,7 +115,7 @@ namespace SabreTools.Serialization
                 var medias = new List<Media>();
                 foreach (var media in item.Media)
                 {
-                    medias.Add(ConvertFromClrMamePro(media));
+                    medias.Add(ConvertToInternalModel(media));
                 }
                 machine[Machine.MediaKey] = medias.ToArray();
             }
@@ -125,7 +125,7 @@ namespace SabreTools.Serialization
                 var samples = new List<Sample>();
                 foreach (var sample in item.Sample)
                 {
-                    samples.Add(ConvertFromClrMamePro(sample));
+                    samples.Add(ConvertToInternalModel(sample));
                 }
                 machine[Machine.SampleKey] = samples.ToArray();
             }
@@ -135,7 +135,7 @@ namespace SabreTools.Serialization
                 var archives = new List<Archive>();
                 foreach (var archive in item.Archive)
                 {
-                    archives.Add(ConvertFromClrMamePro(archive));
+                    archives.Add(ConvertToInternalModel(archive));
                 }
                 machine[Machine.ArchiveKey] = archives.ToArray();
             }
@@ -145,32 +145,32 @@ namespace SabreTools.Serialization
                 var chips = new List<Chip>();
                 foreach (var chip in item.Chip)
                 {
-                    chips.Add(ConvertFromClrMamePro(chip));
+                    chips.Add(ConvertToInternalModel(chip));
                 }
                 machine[Machine.ChipKey] = chips.ToArray();
             }
 
             if (item.Video != null)
-                machine[Machine.VideoKey] = ConvertFromClrMamePro(item.Video);
+                machine[Machine.VideoKey] = ConvertToInternalModel(item.Video);
 
             if (item.Sound != null)
-                machine[Machine.SoundKey] = ConvertFromClrMamePro(item.Sound);
+                machine[Machine.SoundKey] = ConvertToInternalModel(item.Sound);
 
             if (item.Input != null)
-                machine[Machine.InputKey] = ConvertFromClrMamePro(item.Input);
+                machine[Machine.InputKey] = ConvertToInternalModel(item.Input);
 
             if (item.DipSwitch != null && item.DipSwitch.Any())
             {
                 var dipSwitches = new List<DipSwitch>();
                 foreach (var dipSwitch in item.DipSwitch)
                 {
-                    dipSwitches.Add(ConvertFromClrMamePro(dipSwitch));
+                    dipSwitches.Add(ConvertToInternalModel(dipSwitch));
                 }
                 machine[Machine.DipSwitchKey] = dipSwitches.ToArray();
             }
 
             if (item.Driver != null)
-                machine[Machine.DriverKey] = ConvertFromClrMamePro(item.Driver);
+                machine[Machine.DriverKey] = ConvertToInternalModel(item.Driver);
 
             return machine;
         }
@@ -178,7 +178,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Archive"/> to <cref="Archive"/>
         /// </summary>
-        private static Archive ConvertFromClrMamePro(Models.ClrMamePro.Archive item)
+        private static Archive ConvertToInternalModel(Models.ClrMamePro.Archive item)
         {
             var archive = new Archive
             {
@@ -190,7 +190,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.BiosSet"/> to <cref="BiosSet"/>
         /// </summary>
-        private static BiosSet ConvertFromClrMamePro(Models.ClrMamePro.BiosSet item)
+        private static BiosSet ConvertToInternalModel(Models.ClrMamePro.BiosSet item)
         {
             var biosset = new BiosSet
             {
@@ -204,7 +204,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Chip"/> to <cref="Chip"/>
         /// </summary>
-        private static Chip ConvertFromClrMamePro(Models.ClrMamePro.Chip item)
+        private static Chip ConvertToInternalModel(Models.ClrMamePro.Chip item)
         {
             var chip = new Chip
             {
@@ -219,7 +219,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.DipSwitch"/> to <cref="DipSwitch"/>
         /// </summary>
-        private static DipSwitch ConvertFromClrMamePro(Models.ClrMamePro.DipSwitch item)
+        private static DipSwitch ConvertToInternalModel(Models.ClrMamePro.DipSwitch item)
         {
             var dipswitch = new DipSwitch
             {
@@ -233,7 +233,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Disk"/> to <cref="Disk"/>
         /// </summary>
-        private static Disk ConvertFromClrMamePro(Models.ClrMamePro.Disk item)
+        private static Disk ConvertToInternalModel(Models.ClrMamePro.Disk item)
         {
             var disk = new Disk
             {
@@ -250,7 +250,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Driver"/> to <cref="Driver"/>
         /// </summary>
-        private static Driver ConvertFromClrMamePro(Models.ClrMamePro.Driver item)
+        private static Driver ConvertToInternalModel(Models.ClrMamePro.Driver item)
         {
             var driver = new Driver
             {
@@ -266,7 +266,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Input"/> to <cref="Input"/>
         /// </summary>
-        private static Input ConvertFromClrMamePro(Models.ClrMamePro.Input item)
+        private static Input ConvertToInternalModel(Models.ClrMamePro.Input item)
         {
             var input = new Input
             {
@@ -283,7 +283,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Media"/> to <cref="Media"/>
         /// </summary>
-        private static Media ConvertFromClrMamePro(Models.ClrMamePro.Media item)
+        private static Media ConvertToInternalModel(Models.ClrMamePro.Media item)
         {
             var media = new Media
             {
@@ -299,7 +299,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Release"/> to <cref="Release"/>
         /// </summary>
-        private static Release ConvertFromClrMamePro(Models.ClrMamePro.Release item)
+        private static Release ConvertToInternalModel(Models.ClrMamePro.Release item)
         {
             var release = new Release
             {
@@ -315,7 +315,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Rom"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromClrMamePro(Models.ClrMamePro.Rom item)
+        private static Rom ConvertToInternalModel(Models.ClrMamePro.Rom item)
         {
             var rom = new Rom
             {
@@ -347,7 +347,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Sample"/> to <cref="Sample"/>
         /// </summary>
-        private static Sample ConvertFromClrMamePro(Models.ClrMamePro.Sample item)
+        private static Sample ConvertToInternalModel(Models.ClrMamePro.Sample item)
         {
             var sample = new Sample
             {
@@ -359,7 +359,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Sound"/> to <cref="Sound"/>
         /// </summary>
-        private static Sound ConvertFromClrMamePro(Models.ClrMamePro.Sound item)
+        private static Sound ConvertToInternalModel(Models.ClrMamePro.Sound item)
         {
             var sound = new Sound
             {
@@ -371,7 +371,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.Video"/> to <cref="Video"/>
         /// </summary>
-        private static Video ConvertFromClrMamePro(Models.ClrMamePro.Video item)
+        private static Video ConvertToInternalModel(Models.ClrMamePro.Video item)
         {
             var video = new Video
             {
diff --git a/SabreTools.Serialization/Internal.DosCenter.cs b/SabreTools.Serialization/Internal.DosCenter.cs
index f156b034..d10c2a40 100644
--- a/SabreTools.Serialization/Internal.DosCenter.cs
+++ b/SabreTools.Serialization/Internal.DosCenter.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.DosCenter.MetadataFile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromDosCenter(Models.DosCenter.MetadataFile item)
+        public static MetadataFile ConvertToInternalModel(Models.DosCenter.MetadataFile item)
         {
             var metadataFile = new MetadataFile();
 
             if (item?.DosCenter != null)
-                metadataFile[MetadataFile.HeaderKey] = ConvertHeaderFromDosCenter(item.DosCenter);
+                metadataFile[MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.DosCenter);
 
             if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineFromDosCenter).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,7 +30,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.DosCenter.DosCenter"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromDosCenter(Models.DosCenter.DosCenter item)
+        private static Header ConvertHeaderToInternalModel(Models.DosCenter.DosCenter item)
         {
             var header = new Header
             {
@@ -48,7 +48,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.DosCenter.Game"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromDosCenter(Models.DosCenter.Game item)
+        private static Machine ConvertMachineToInternalModel(Models.DosCenter.Game item)
         {
             var machine = new Machine
             {
@@ -60,7 +60,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var file in item.File)
                 {
-                    roms.Add(ConvertFromDosCenter(file));
+                    roms.Add(ConvertToInternalModel(file));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -71,7 +71,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.DosCenter.File"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromDosCenter(Models.DosCenter.File item)
+        private static Rom ConvertToInternalModel(Models.DosCenter.File item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.EverdriveSMDB.cs b/SabreTools.Serialization/Internal.EverdriveSMDB.cs
index eac7429b..6f54f39c 100644
--- a/SabreTools.Serialization/Internal.EverdriveSMDB.cs
+++ b/SabreTools.Serialization/Internal.EverdriveSMDB.cs
@@ -13,15 +13,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.EverdriveSMDB.MetadataFile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromEverdriveSMDB(Models.EverdriveSMDB.MetadataFile item)
+        public static MetadataFile ConvertToInternalModel(Models.EverdriveSMDB.MetadataFile item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromEverdriveSMDB(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Row != null && item.Row.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Row.Select(ConvertMachineFromEverdriveSMDB).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Row.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -29,7 +29,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.EverdriveSMDB.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromEverdriveSMDB(Models.EverdriveSMDB.MetadataFile item)
+        private static Header ConvertHeaderToInternalModel(Models.EverdriveSMDB.MetadataFile item)
         {
             var header = new Header
             {
@@ -41,11 +41,11 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
+        private static Machine ConvertMachineToInternalModel(Models.EverdriveSMDB.Row item)
         {
             var machine = new Machine
             {
-                [Machine.RomKey] = ConvertFromEverdriveSMDB(item),
+                [Machine.RomKey] = ConvertToInternalModel(item),
             };
             return machine;
         }
@@ -53,7 +53,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
+        private static Rom ConvertToInternalModel(Models.EverdriveSMDB.Row item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.Hashfile.cs b/SabreTools.Serialization/Internal.Hashfile.cs
index 88242c58..22f204d5 100644
--- a/SabreTools.Serialization/Internal.Hashfile.cs
+++ b/SabreTools.Serialization/Internal.Hashfile.cs
@@ -15,14 +15,14 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromHashfile(Models.Hashfile.Hashfile item)
+        public static MetadataFile ConvertToInternalModel(Models.Hashfile.Hashfile item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromHashfile(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
-            var machine = ConvertMachineFromHashfile(item);
+            var machine = ConvertMachineToInternalModel(item);
             metadataFile[MetadataFile.MachineKey] = new Machine[] { machine };
 
             return metadataFile;
@@ -31,7 +31,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromHashfile(Models.Hashfile.Hashfile item)
+        private static Header ConvertHeaderToInternalModel(Models.Hashfile.Hashfile item)
         {
             var header = new Header
             {
@@ -43,7 +43,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromHashfile(Models.Hashfile.Hashfile item)
+        private static Machine ConvertMachineToInternalModel(Models.Hashfile.Hashfile item)
         {
             var machine = new Machine();
 
@@ -52,7 +52,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var sfv in item.SFV)
                 {
-                    roms.Add(ConvertFromSFV(sfv));
+                    roms.Add(ConvertToInternalModel(sfv));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -62,7 +62,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var md5 in item.MD5)
                 {
-                    roms.Add(ConvertFromMD5(md5));
+                    roms.Add(ConvertToInternalModel(md5));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -72,7 +72,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var sha1 in item.SHA1)
                 {
-                    roms.Add(ConvertFromSHA1(sha1));
+                    roms.Add(ConvertToInternalModel(sha1));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -82,7 +82,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var sha256 in item.SHA256)
                 {
-                    roms.Add(ConvertFromSHA256(sha256));
+                    roms.Add(ConvertToInternalModel(sha256));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -92,7 +92,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var sha384 in item.SHA384)
                 {
-                    roms.Add(ConvertFromSHA384(sha384));
+                    roms.Add(ConvertToInternalModel(sha384));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -102,7 +102,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var sha512 in item.SHA512)
                 {
-                    roms.Add(ConvertFromSHA512(sha512));
+                    roms.Add(ConvertToInternalModel(sha512));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -112,7 +112,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var spamSum in item.SpamSum)
                 {
-                    roms.Add(ConvertFromSpamSum(spamSum));
+                    roms.Add(ConvertToInternalModel(spamSum));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -123,7 +123,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.MD5"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromMD5(Models.Hashfile.MD5 item)
+        private static Rom ConvertToInternalModel(Models.Hashfile.MD5 item)
         {
             var rom = new Rom
             {
@@ -136,7 +136,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.SFV"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromSFV(Models.Hashfile.SFV item)
+        private static Rom ConvertToInternalModel(Models.Hashfile.SFV item)
         {
             var rom = new Rom
             {
@@ -149,7 +149,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.SHA1"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromSHA1(Models.Hashfile.SHA1 item)
+        private static Rom ConvertToInternalModel(Models.Hashfile.SHA1 item)
         {
             var rom = new Rom
             {
@@ -162,7 +162,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.SHA256"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromSHA256(Models.Hashfile.SHA256 item)
+        private static Rom ConvertToInternalModel(Models.Hashfile.SHA256 item)
         {
             var rom = new Rom
             {
@@ -175,7 +175,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.SHA384"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromSHA384(Models.Hashfile.SHA384 item)
+        private static Rom ConvertToInternalModel(Models.Hashfile.SHA384 item)
         {
             var rom = new Rom
             {
@@ -188,7 +188,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.SHA512"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromSHA512(Models.Hashfile.SHA512 item)
+        private static Rom ConvertToInternalModel(Models.Hashfile.SHA512 item)
         {
             var rom = new Rom
             {
@@ -201,7 +201,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Hashfile.SpamSum"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromSpamSum(Models.Hashfile.SpamSum item)
+        private static Rom ConvertToInternalModel(Models.Hashfile.SpamSum item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.Listrom.cs b/SabreTools.Serialization/Internal.Listrom.cs
index 12401854..67ae33a5 100644
--- a/SabreTools.Serialization/Internal.Listrom.cs
+++ b/SabreTools.Serialization/Internal.Listrom.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listrom.MetadataFile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromListrom(Models.Listrom.MetadataFile item)
+        public static MetadataFile ConvertToInternalModel(Models.Listrom.MetadataFile item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromListrom(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Set != null && item.Set.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Set.Select(ConvertMachineFromListrom).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Set.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,7 +30,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listrom.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromListrom(Models.Listrom.MetadataFile item)
+        private static Header ConvertHeaderToInternalModel(Models.Listrom.MetadataFile item)
         {
             var header = new Header
             {
@@ -42,7 +42,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listrom.Set"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromListrom(Models.Listrom.Set item)
+        private static Machine ConvertMachineToInternalModel(Models.Listrom.Set item)
         {
             var machine = new Machine();
             if (!string.IsNullOrWhiteSpace(item.Device))
@@ -60,7 +60,7 @@ namespace SabreTools.Serialization
                 var datItems = new List<DatItem>();
                 foreach (var file in item.Row)
                 {
-                    datItems.Add(ConvertFromListrom(file));
+                    datItems.Add(ConvertToInternalModel(file));
                 }
 
                 machine[Machine.DiskKey] = datItems.Where(i => i.ReadString(DatItem.TypeKey) == "disk")?.ToArray();
@@ -73,7 +73,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listrom.Row"/> to <cref="DatItem"/>
         /// </summary>
-        private static DatItem ConvertFromListrom(Models.Listrom.Row item)
+        private static DatItem ConvertToInternalModel(Models.Listrom.Row item)
         {
             if (item.Size == null)
             {
diff --git a/SabreTools.Serialization/Internal.Listxml.cs b/SabreTools.Serialization/Internal.Listxml.cs
index cebf14d9..9dd7f618 100644
--- a/SabreTools.Serialization/Internal.Listxml.cs
+++ b/SabreTools.Serialization/Internal.Listxml.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.M1"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromListxml(Models.Listxml.M1 item)
+        public static MetadataFile ConvertToInternalModel(Models.Listxml.M1 item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromListxml(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineFromListxml).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,15 +30,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Mame"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromListxml(Models.Listxml.Mame item)
+        public static MetadataFile ConvertToInternalModel(Models.Listxml.Mame item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromListxml(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineFromListxml).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -46,7 +46,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.M1"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromListxml(Models.Listxml.M1 item)
+        private static Header ConvertHeaderToInternalModel(Models.Listxml.M1 item)
         {
             var header = new Header
             {
@@ -58,7 +58,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Mame"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromListxml(Models.Listxml.Mame item)
+        private static Header ConvertHeaderToInternalModel(Models.Listxml.Mame item)
         {
             var header = new Header
             {
@@ -72,7 +72,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.GameBase"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromListxml(Models.Listxml.GameBase item)
+        private static Machine ConvertMachineToInternalModel(Models.Listxml.GameBase item)
         {
             var machine = new Machine
             {
@@ -96,7 +96,7 @@ namespace SabreTools.Serialization
                 var biosSets = new List<BiosSet>();
                 foreach (var biosSet in item.BiosSet)
                 {
-                    biosSets.Add(ConvertFromListxml(biosSet));
+                    biosSets.Add(ConvertToInternalModel(biosSet));
                 }
                 machine[Machine.BiosSetKey] = biosSets.ToArray();
             }
@@ -106,7 +106,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
-                    roms.Add(ConvertFromListxml(rom));
+                    roms.Add(ConvertToInternalModel(rom));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -116,7 +116,7 @@ namespace SabreTools.Serialization
                 var disks = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
-                    disks.Add(ConvertFromListxml(disk));
+                    disks.Add(ConvertToInternalModel(disk));
                 }
                 machine[Machine.DiskKey] = disks.ToArray();
             }
@@ -126,7 +126,7 @@ namespace SabreTools.Serialization
                 var deviceRefs = new List<DeviceRef>();
                 foreach (var deviceRef in item.DeviceRef)
                 {
-                    deviceRefs.Add(ConvertFromListxml(deviceRef));
+                    deviceRefs.Add(ConvertToInternalModel(deviceRef));
                 }
                 machine[Machine.DeviceRefKey] = deviceRefs.ToArray();
             }
@@ -136,7 +136,7 @@ namespace SabreTools.Serialization
                 var samples = new List<Sample>();
                 foreach (var sample in item.Sample)
                 {
-                    samples.Add(ConvertFromListxml(sample));
+                    samples.Add(ConvertToInternalModel(sample));
                 }
                 machine[Machine.SampleKey] = samples.ToArray();
             }
@@ -146,7 +146,7 @@ namespace SabreTools.Serialization
                 var chips = new List<Chip>();
                 foreach (var chip in item.Chip)
                 {
-                    chips.Add(ConvertFromListxml(chip));
+                    chips.Add(ConvertToInternalModel(chip));
                 }
                 machine[Machine.ChipKey] = chips.ToArray();
             }
@@ -156,7 +156,7 @@ namespace SabreTools.Serialization
                 var displays = new List<Display>();
                 foreach (var display in item.Display)
                 {
-                    displays.Add(ConvertFromListxml(display));
+                    displays.Add(ConvertToInternalModel(display));
                 }
                 machine[Machine.DisplayKey] = displays.ToArray();
             }
@@ -166,23 +166,23 @@ namespace SabreTools.Serialization
                 var videos = new List<Video>();
                 foreach (var video in item.Video)
                 {
-                    videos.Add(ConvertFromListxml(video));
+                    videos.Add(ConvertToInternalModel(video));
                 }
                 machine[Machine.VideoKey] = videos.ToArray();
             }
 
             if (item.Sound != null)
-                machine[Machine.SoundKey] = ConvertFromListxml(item.Sound);
+                machine[Machine.SoundKey] = ConvertToInternalModel(item.Sound);
 
             if (item.Input != null)
-                machine[Machine.InputKey] = ConvertFromListxml(item.Input);
+                machine[Machine.InputKey] = ConvertToInternalModel(item.Input);
 
             if (item.DipSwitch != null && item.DipSwitch.Any())
             {
                 var dipSwitches = new List<DipSwitch>();
                 foreach (var dipSwitch in item.DipSwitch)
                 {
-                    dipSwitches.Add(ConvertFromListxml(dipSwitch));
+                    dipSwitches.Add(ConvertToInternalModel(dipSwitch));
                 }
                 machine[Machine.DipSwitchKey] = dipSwitches.ToArray();
             }
@@ -192,7 +192,7 @@ namespace SabreTools.Serialization
                 var configurations = new List<Configuration>();
                 foreach (var configuration in item.Configuration)
                 {
-                    configurations.Add(ConvertFromListxml(configuration));
+                    configurations.Add(ConvertToInternalModel(configuration));
                 }
                 machine[Machine.ConfigurationKey] = configurations.ToArray();
             }
@@ -202,7 +202,7 @@ namespace SabreTools.Serialization
                 var ports = new List<Port>();
                 foreach (var port in item.Port)
                 {
-                    ports.Add(ConvertFromListxml(port));
+                    ports.Add(ConvertToInternalModel(port));
                 }
                 machine[Machine.PortKey] = ports.ToArray();
             }
@@ -212,20 +212,20 @@ namespace SabreTools.Serialization
                 var adjusters = new List<Adjuster>();
                 foreach (var adjuster in item.Adjuster)
                 {
-                    adjusters.Add(ConvertFromListxml(adjuster));
+                    adjusters.Add(ConvertToInternalModel(adjuster));
                 }
                 machine[Machine.AdjusterKey] = adjusters.ToArray();
             }
 
             if (item.Driver != null)
-                machine[Machine.DriverKey] = ConvertFromListxml(item.Driver);
+                machine[Machine.DriverKey] = ConvertToInternalModel(item.Driver);
 
             if (item.Feature != null && item.Feature.Any())
             {
                 var features = new List<Feature>();
                 foreach (var feature in item.Feature)
                 {
-                    features.Add(ConvertFromListxml(feature));
+                    features.Add(ConvertToInternalModel(feature));
                 }
                 machine[Machine.FeatureKey] = features.ToArray();
             }
@@ -235,7 +235,7 @@ namespace SabreTools.Serialization
                 var devices = new List<Device>();
                 foreach (var device in item.Device)
                 {
-                    devices.Add(ConvertFromListxml(device));
+                    devices.Add(ConvertToInternalModel(device));
                 }
                 machine[Machine.DeviceKey] = devices.ToArray();
             }
@@ -245,7 +245,7 @@ namespace SabreTools.Serialization
                 var slots = new List<Slot>();
                 foreach (var slot in item.Slot)
                 {
-                    slots.Add(ConvertFromListxml(slot));
+                    slots.Add(ConvertToInternalModel(slot));
                 }
                 machine[Machine.SlotKey] = slots.ToArray();
             }
@@ -255,7 +255,7 @@ namespace SabreTools.Serialization
                 var softwareLists = new List<SoftwareList>();
                 foreach (var softwareList in item.SoftwareList)
                 {
-                    softwareLists.Add(ConvertFromListxml(softwareList));
+                    softwareLists.Add(ConvertToInternalModel(softwareList));
                 }
                 machine[Machine.SoftwareListKey] = softwareLists.ToArray();
             }
@@ -265,7 +265,7 @@ namespace SabreTools.Serialization
                 var ramOptions = new List<RamOption>();
                 foreach (var ramOption in item.RamOption)
                 {
-                    ramOptions.Add(ConvertFromListxml(ramOption));
+                    ramOptions.Add(ConvertToInternalModel(ramOption));
                 }
                 machine[Machine.RamOptionKey] = ramOptions.ToArray();
             }
@@ -276,7 +276,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Adjuster"/> to <cref="Adjuster"/>
         /// </summary>
-        private static Adjuster ConvertFromListxml(Models.Listxml.Adjuster item)
+        private static Adjuster ConvertToInternalModel(Models.Listxml.Adjuster item)
         {
             var adjuster = new Adjuster
             {
@@ -285,7 +285,7 @@ namespace SabreTools.Serialization
             };
 
             if (item.Condition != null)
-                adjuster[Adjuster.ConditionKey] = ConvertFromListxml(item.Condition);
+                adjuster[Adjuster.ConditionKey] = ConvertToInternalModel(item.Condition);
 
             return adjuster;
         }
@@ -293,7 +293,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Analog"/> to <cref="Analog"/>
         /// </summary>
-        private static Analog ConvertFromListxml(Models.Listxml.Analog item)
+        private static Analog ConvertToInternalModel(Models.Listxml.Analog item)
         {
             var analog = new Analog
             {
@@ -305,7 +305,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.BiosSet"/> to <cref="BiosSet"/>
         /// </summary>
-        private static BiosSet ConvertFromListxml(Models.Listxml.BiosSet item)
+        private static BiosSet ConvertToInternalModel(Models.Listxml.BiosSet item)
         {
             var biosset = new BiosSet
             {
@@ -319,7 +319,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Chip"/> to <cref="Chip"/>
         /// </summary>
-        private static Chip ConvertFromListxml(Models.Listxml.Chip item)
+        private static Chip ConvertToInternalModel(Models.Listxml.Chip item)
         {
             var chip = new Chip
             {
@@ -335,7 +335,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Condition"/> to <cref="Condition"/>
         /// </summary>
-        private static Condition ConvertFromListxml(Models.Listxml.Condition item)
+        private static Condition ConvertToInternalModel(Models.Listxml.Condition item)
         {
             var condition = new Condition
             {
@@ -350,7 +350,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Configuration"/> to <cref="Configuration"/>
         /// </summary>
-        private static Configuration ConvertFromListxml(Models.Listxml.Configuration item)
+        private static Configuration ConvertToInternalModel(Models.Listxml.Configuration item)
         {
             var configuration = new Configuration
             {
@@ -360,14 +360,14 @@ namespace SabreTools.Serialization
             };
 
             if (item.Condition != null)
-                configuration[Configuration.ConditionKey] = ConvertFromListxml(item.Condition);
+                configuration[Configuration.ConditionKey] = ConvertToInternalModel(item.Condition);
 
             if (item.ConfLocation != null && item.ConfLocation.Any())
             {
                 var confLocations = new List<ConfLocation>();
                 foreach (var confLocation in item.ConfLocation)
                 {
-                    confLocations.Add(ConvertFromListxml(confLocation));
+                    confLocations.Add(ConvertToInternalModel(confLocation));
                 }
                 configuration[Configuration.ConfLocationKey] = confLocations.ToArray();
             }
@@ -377,7 +377,7 @@ namespace SabreTools.Serialization
                 var confSettings = new List<ConfSetting>();
                 foreach (var confSetting in item.ConfSetting)
                 {
-                    confSettings.Add(ConvertFromListxml(confSetting));
+                    confSettings.Add(ConvertToInternalModel(confSetting));
                 }
                 configuration[Configuration.ConfSettingKey] = confSettings.ToArray();
             }
@@ -388,7 +388,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.ConfLocation"/> to <cref="ConfLocation"/>
         /// </summary>
-        private static ConfLocation ConvertFromListxml(Models.Listxml.ConfLocation item)
+        private static ConfLocation ConvertToInternalModel(Models.Listxml.ConfLocation item)
         {
             var confLocation = new ConfLocation
             {
@@ -402,7 +402,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.ConfSetting"/> to <cref="ConfSetting"/>
         /// </summary>
-        private static ConfSetting ConvertFromListxml(Models.Listxml.ConfSetting item)
+        private static ConfSetting ConvertToInternalModel(Models.Listxml.ConfSetting item)
         {
             var confSetting = new ConfSetting
             {
@@ -412,7 +412,7 @@ namespace SabreTools.Serialization
             };
 
             if (item.Condition != null)
-                confSetting[ConfSetting.ConditionKey] = ConvertFromListxml(item.Condition);
+                confSetting[ConfSetting.ConditionKey] = ConvertToInternalModel(item.Condition);
 
             return confSetting;
         }
@@ -420,7 +420,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Control"/> to <cref="Control"/>
         /// </summary>
-        private static Control ConvertFromListxml(Models.Listxml.Control item)
+        private static Control ConvertToInternalModel(Models.Listxml.Control item)
         {
             var control = new Control
             {
@@ -443,7 +443,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Device"/> to <cref="Device"/>
         /// </summary>
-        private static Device ConvertFromListxml(Models.Listxml.Device item)
+        private static Device ConvertToInternalModel(Models.Listxml.Device item)
         {
             var device = new Device
             {
@@ -455,14 +455,14 @@ namespace SabreTools.Serialization
             };
 
             if (item.Instance != null)
-                device[Device.InstanceKey] = ConvertFromListxml(item.Instance);
+                device[Device.InstanceKey] = ConvertToInternalModel(item.Instance);
 
             if (item.Extension != null && item.Extension.Any())
             {
                 var extensions = new List<Extension>();
                 foreach (var extension in item.Extension)
                 {
-                    extensions.Add(ConvertFromListxml(extension));
+                    extensions.Add(ConvertToInternalModel(extension));
                 }
                 device[Device.ExtensionKey] = extensions.ToArray();
             }
@@ -473,7 +473,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.DeviceRef"/> to <cref="DeviceRef"/>
         /// </summary>
-        private static DeviceRef ConvertFromListxml(Models.Listxml.DeviceRef item)
+        private static DeviceRef ConvertToInternalModel(Models.Listxml.DeviceRef item)
         {
             var deviceRef = new DeviceRef
             {
@@ -485,7 +485,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.DipLocation"/> to <cref="DipLocation"/>
         /// </summary>
-        private static DipLocation ConvertFromListxml(Models.Listxml.DipLocation item)
+        private static DipLocation ConvertToInternalModel(Models.Listxml.DipLocation item)
         {
             var dipLocation = new DipLocation
             {
@@ -499,7 +499,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.DipSwitch"/> to <cref="DipSwitch"/>
         /// </summary>
-        private static DipSwitch ConvertFromListxml(Models.Listxml.DipSwitch item)
+        private static DipSwitch ConvertToInternalModel(Models.Listxml.DipSwitch item)
         {
             var dipSwitch = new DipSwitch
             {
@@ -509,14 +509,14 @@ namespace SabreTools.Serialization
             };
 
             if (item.Condition != null)
-                dipSwitch[DipSwitch.ConditionKey] = ConvertFromListxml(item.Condition);
+                dipSwitch[DipSwitch.ConditionKey] = ConvertToInternalModel(item.Condition);
 
             if (item.DipLocation != null && item.DipLocation.Any())
             {
                 var dipLocations = new List<DipLocation>();
                 foreach (var dipLocation in item.DipLocation)
                 {
-                    dipLocations.Add(ConvertFromListxml(dipLocation));
+                    dipLocations.Add(ConvertToInternalModel(dipLocation));
                 }
                 dipSwitch[DipSwitch.DipLocationKey] = dipLocations.ToArray();
             }
@@ -526,7 +526,7 @@ namespace SabreTools.Serialization
                 var dipValues = new List<DipValue>();
                 foreach (var dipValue in item.DipValue)
                 {
-                    dipValues.Add(ConvertFromListxml(dipValue));
+                    dipValues.Add(ConvertToInternalModel(dipValue));
                 }
                 dipSwitch[DipSwitch.DipValueKey] = dipValues.ToArray();
             }
@@ -537,7 +537,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.DipValue"/> to <cref="DipValue"/>
         /// </summary>
-        private static DipValue ConvertFromListxml(Models.Listxml.DipValue item)
+        private static DipValue ConvertToInternalModel(Models.Listxml.DipValue item)
         {
             var dipValue = new DipValue
             {
@@ -547,7 +547,7 @@ namespace SabreTools.Serialization
             };
 
             if (item.Condition != null)
-                dipValue[DipValue.ConditionKey] = ConvertFromListxml(item.Condition);
+                dipValue[DipValue.ConditionKey] = ConvertToInternalModel(item.Condition);
 
             return dipValue;
         }
@@ -555,7 +555,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Disk"/> to <cref="Disk"/>
         /// </summary>
-        private static Disk ConvertFromListxml(Models.Listxml.Disk item)
+        private static Disk ConvertToInternalModel(Models.Listxml.Disk item)
         {
             var disk = new Disk
             {
@@ -575,7 +575,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Display"/> to <cref="Display"/>
         /// </summary>
-        private static Display ConvertFromListxml(Models.Listxml.Display item)
+        private static Display ConvertToInternalModel(Models.Listxml.Display item)
         {
             var display = new Display
             {
@@ -600,7 +600,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Driver"/> to <cref="Driver"/>
         /// </summary>
-        private static Driver ConvertFromListxml(Models.Listxml.Driver item)
+        private static Driver ConvertToInternalModel(Models.Listxml.Driver item)
         {
             var driver = new Driver
             {
@@ -622,7 +622,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Extension"/> to <cref="Extension"/>
         /// </summary>
-        private static Extension ConvertFromListxml(Models.Listxml.Extension item)
+        private static Extension ConvertToInternalModel(Models.Listxml.Extension item)
         {
             var extension = new Extension
             {
@@ -634,7 +634,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Feature"/> to <cref="Feature"/>
         /// </summary>
-        private static Feature ConvertFromListxml(Models.Listxml.Feature item)
+        private static Feature ConvertToInternalModel(Models.Listxml.Feature item)
         {
             var feature = new Feature
             {
@@ -648,7 +648,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Input"/> to <cref="Input"/>
         /// </summary>
-        private static Input ConvertFromListxml(Models.Listxml.Input item)
+        private static Input ConvertToInternalModel(Models.Listxml.Input item)
         {
             var input = new Input
             {
@@ -665,7 +665,7 @@ namespace SabreTools.Serialization
                 var controls = new List<Control>();
                 foreach (var control in item.Control)
                 {
-                    controls.Add(ConvertFromListxml(control));
+                    controls.Add(ConvertToInternalModel(control));
                 }
                 input[Input.ControlKey] = controls.ToArray();
             }
@@ -676,7 +676,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Instance"/> to <cref="Instance"/>
         /// </summary>
-        private static Instance ConvertFromListxml(Models.Listxml.Instance item)
+        private static Instance ConvertToInternalModel(Models.Listxml.Instance item)
         {
             var instance = new Instance
             {
@@ -689,7 +689,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Port"/> to <cref="Port"/>
         /// </summary>
-        private static Port ConvertFromListxml(Models.Listxml.Port item)
+        private static Port ConvertToInternalModel(Models.Listxml.Port item)
         {
             var port = new Port
             {
@@ -701,7 +701,7 @@ namespace SabreTools.Serialization
                 var analogs = new List<Analog>();
                 foreach (var analog in item.Analog)
                 {
-                    analogs.Add(ConvertFromListxml(analog));
+                    analogs.Add(ConvertToInternalModel(analog));
                 }
                 port[Port.AnalogKey] = analogs.ToArray();
             }
@@ -712,7 +712,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.RamOption"/> to <cref="RamOption"/>
         /// </summary>
-        private static RamOption ConvertFromListxml(Models.Listxml.RamOption item)
+        private static RamOption ConvertToInternalModel(Models.Listxml.RamOption item)
         {
             var ramOption = new RamOption
             {
@@ -725,7 +725,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Rom"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromListxml(Models.Listxml.Rom item)
+        private static Rom ConvertToInternalModel(Models.Listxml.Rom item)
         {
             var rom = new Rom
             {
@@ -748,7 +748,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Sample"/> to <cref="Sample"/>
         /// </summary>
-        private static Sample ConvertFromListxml(Models.Listxml.Sample item)
+        private static Sample ConvertToInternalModel(Models.Listxml.Sample item)
         {
             var sample = new Sample
             {
@@ -760,7 +760,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Slot"/> to <cref="Slot"/>
         /// </summary>
-        private static Slot ConvertFromListxml(Models.Listxml.Slot item)
+        private static Slot ConvertToInternalModel(Models.Listxml.Slot item)
         {
             var slot = new Slot
             {
@@ -772,7 +772,7 @@ namespace SabreTools.Serialization
                 var slotOptions = new List<SlotOption>();
                 foreach (var slotOption in item.SlotOption)
                 {
-                    slotOptions.Add(ConvertFromListxml(slotOption));
+                    slotOptions.Add(ConvertToInternalModel(slotOption));
                 }
                 slot[Slot.SlotOptionKey] = slotOptions.ToArray();
             }
@@ -783,7 +783,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.SlotOption"/> to <cref="SlotOption"/>
         /// </summary>
-        private static SlotOption ConvertFromListxml(Models.Listxml.SlotOption item)
+        private static SlotOption ConvertToInternalModel(Models.Listxml.SlotOption item)
         {
             var slotOption = new SlotOption
             {
@@ -797,7 +797,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.SoftwareList"/> to <cref="SoftwareList"/>
         /// </summary>
-        private static SoftwareList ConvertFromListxml(Models.Listxml.SoftwareList item)
+        private static SoftwareList ConvertToInternalModel(Models.Listxml.SoftwareList item)
         {
             var softwareList = new SoftwareList
             {
@@ -812,7 +812,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Sound"/> to <cref="Sound"/>
         /// </summary>
-        private static Sound ConvertFromListxml(Models.Listxml.Sound item)
+        private static Sound ConvertToInternalModel(Models.Listxml.Sound item)
         {
             var sound = new Sound
             {
@@ -824,7 +824,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Listxml.Video"/> to <cref="Video"/>
         /// </summary>
-        private static Video ConvertFromListxml(Models.Listxml.Video item)
+        private static Video ConvertToInternalModel(Models.Listxml.Video item)
         {
             var video = new Video
             {
diff --git a/SabreTools.Serialization/Internal.Logiqx.cs b/SabreTools.Serialization/Internal.Logiqx.cs
index f77ec5e5..eea26122 100644
--- a/SabreTools.Serialization/Internal.Logiqx.cs
+++ b/SabreTools.Serialization/Internal.Logiqx.cs
@@ -14,16 +14,16 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Datafile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromLogiqx(Models.Logiqx.Datafile item)
+        public static MetadataFile ConvertToInternalModel(Models.Logiqx.Datafile item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromLogiqx(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             // TODO: Handle Dir items
             if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineFromLogiqx).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -31,9 +31,9 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Datafile"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromLogiqx(Models.Logiqx.Datafile item)
+        private static Header ConvertHeaderToInternalModel(Models.Logiqx.Datafile item)
         {
-            var header = ConvertHeaderFromLogiqx(item.Header);
+            var header = ConvertHeaderToInternalModel(item.Header);
 
             header[Header.BuildKey] = item.Build;
             header[Header.DebugKey] = item.Debug;
@@ -45,7 +45,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Header"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromLogiqx(Models.Logiqx.Header item)
+        private static Header ConvertHeaderToInternalModel(Models.Logiqx.Header item)
         {
             var header = new Header
             {
@@ -89,7 +89,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.GameBase"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromLogiqx(Models.Logiqx.GameBase item)
+        private static Machine ConvertMachineToInternalModel(Models.Logiqx.GameBase item)
         {
             var machine = new Machine
             {
@@ -120,7 +120,7 @@ namespace SabreTools.Serialization
                 var releases = new List<Release>();
                 foreach (var release in item.Release)
                 {
-                    releases.Add(ConvertFromLogiqx(release));
+                    releases.Add(ConvertToInternalModel(release));
                 }
                 machine[Machine.ReleaseKey] = releases.ToArray();
             }
@@ -130,7 +130,7 @@ namespace SabreTools.Serialization
                 var biosSets = new List<BiosSet>();
                 foreach (var biosSet in item.BiosSet)
                 {
-                    biosSets.Add(ConvertFromLogiqx(biosSet));
+                    biosSets.Add(ConvertToInternalModel(biosSet));
                 }
                 machine[Machine.BiosSetKey] = biosSets.ToArray();
             }
@@ -140,7 +140,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
-                    roms.Add(ConvertFromLogiqx(rom));
+                    roms.Add(ConvertToInternalModel(rom));
                 }
                 machine[Machine.RomKey] = roms.ToArray();
             }
@@ -150,7 +150,7 @@ namespace SabreTools.Serialization
                 var disks = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
-                    disks.Add(ConvertFromLogiqx(disk));
+                    disks.Add(ConvertToInternalModel(disk));
                 }
                 machine[Machine.DiskKey] = disks.ToArray();
             }
@@ -160,7 +160,7 @@ namespace SabreTools.Serialization
                 var medias = new List<Media>();
                 foreach (var media in item.Media)
                 {
-                    medias.Add(ConvertFromLogiqx(media));
+                    medias.Add(ConvertToInternalModel(media));
                 }
                 machine[Machine.MediaKey] = medias.ToArray();
             }
@@ -170,7 +170,7 @@ namespace SabreTools.Serialization
                 var deviceRefs = new List<DeviceRef>();
                 foreach (var deviceRef in item.DeviceRef)
                 {
-                    deviceRefs.Add(ConvertFromLogiqx(deviceRef));
+                    deviceRefs.Add(ConvertToInternalModel(deviceRef));
                 }
                 machine[Machine.DeviceRefKey] = deviceRefs.ToArray();
             }
@@ -180,7 +180,7 @@ namespace SabreTools.Serialization
                 var samples = new List<Sample>();
                 foreach (var sample in item.Sample)
                 {
-                    samples.Add(ConvertFromLogiqx(sample));
+                    samples.Add(ConvertToInternalModel(sample));
                 }
                 machine[Machine.SampleKey] = samples.ToArray();
             }
@@ -190,7 +190,7 @@ namespace SabreTools.Serialization
                 var archives = new List<Archive>();
                 foreach (var archive in item.Archive)
                 {
-                    archives.Add(ConvertFromLogiqx(archive));
+                    archives.Add(ConvertToInternalModel(archive));
                 }
                 machine[Machine.ArchiveKey] = archives.ToArray();
             }
@@ -200,7 +200,7 @@ namespace SabreTools.Serialization
                 var drivers = new List<Driver>();
                 foreach (var driver in item.Driver)
                 {
-                    drivers.Add(ConvertFromLogiqx(driver));
+                    drivers.Add(ConvertToInternalModel(driver));
                 }
                 machine[Machine.DriverKey] = drivers.ToArray();
             }
@@ -210,7 +210,7 @@ namespace SabreTools.Serialization
                 var softwareLists = new List<SoftwareList>();
                 foreach (var softwareList in item.SoftwareList)
                 {
-                    softwareLists.Add(ConvertFromLogiqx(softwareList));
+                    softwareLists.Add(ConvertToInternalModel(softwareList));
                 }
                 machine[Machine.SoftwareListKey] = softwareLists.ToArray();
             }
@@ -221,7 +221,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Archive"/> to <cref="Archive"/>
         /// </summary>
-        private static Archive ConvertFromLogiqx(Models.Logiqx.Archive item)
+        private static Archive ConvertToInternalModel(Models.Logiqx.Archive item)
         {
             var archive = new Archive
             {
@@ -233,7 +233,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.BiosSet"/> to <cref="BiosSet"/>
         /// </summary>
-        private static BiosSet ConvertFromLogiqx(Models.Logiqx.BiosSet item)
+        private static BiosSet ConvertToInternalModel(Models.Logiqx.BiosSet item)
         {
             var biosset = new BiosSet
             {
@@ -247,7 +247,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.DeviceRef"/> to <cref="DeviceRef"/>
         /// </summary>
-        private static DeviceRef ConvertFromLogiqx(Models.Logiqx.DeviceRef item)
+        private static DeviceRef ConvertToInternalModel(Models.Logiqx.DeviceRef item)
         {
             var deviceRef = new DeviceRef
             {
@@ -259,7 +259,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Disk"/> to <cref="Disk"/>
         /// </summary>
-        private static Disk ConvertFromLogiqx(Models.Logiqx.Disk item)
+        private static Disk ConvertToInternalModel(Models.Logiqx.Disk item)
         {
             var disk = new Disk
             {
@@ -276,7 +276,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Driver"/> to <cref="Driver"/>
         /// </summary>
-        private static Driver ConvertFromLogiqx(Models.Logiqx.Driver item)
+        private static Driver ConvertToInternalModel(Models.Logiqx.Driver item)
         {
             var driver = new Driver
             {
@@ -295,7 +295,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Media"/> to <cref="Media"/>
         /// </summary>
-        private static Media ConvertFromLogiqx(Models.Logiqx.Media item)
+        private static Media ConvertToInternalModel(Models.Logiqx.Media item)
         {
             var media = new Media
             {
@@ -311,7 +311,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Release"/> to <cref="Release"/>
         /// </summary>
-        private static Release ConvertFromLogiqx(Models.Logiqx.Release item)
+        private static Release ConvertToInternalModel(Models.Logiqx.Release item)
         {
             var release = new Release
             {
@@ -327,7 +327,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Rom"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromLogiqx(Models.Logiqx.Rom item)
+        private static Rom ConvertToInternalModel(Models.Logiqx.Rom item)
         {
             var rom = new Rom
             {
@@ -356,7 +356,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.Sample"/> to <cref="Sample"/>
         /// </summary>
-        private static Sample ConvertFromLogiqx(Models.Logiqx.Sample item)
+        private static Sample ConvertToInternalModel(Models.Logiqx.Sample item)
         {
             var sample = new Sample
             {
@@ -368,7 +368,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.Logiqx.SoftwareList"/> to <cref="SoftwareList"/>
         /// </summary>
-        private static SoftwareList ConvertFromLogiqx(Models.Logiqx.SoftwareList item)
+        private static SoftwareList ConvertToInternalModel(Models.Logiqx.SoftwareList item)
         {
             var softwareList = new SoftwareList
             {
diff --git a/SabreTools.Serialization/Internal.OfflineList.cs b/SabreTools.Serialization/Internal.OfflineList.cs
index 3c2adcbe..559b14ae 100644
--- a/SabreTools.Serialization/Internal.OfflineList.cs
+++ b/SabreTools.Serialization/Internal.OfflineList.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OfflineList.Dat"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromOfflineList(Models.OfflineList.Dat item)
+        public static MetadataFile ConvertToInternalModel(Models.OfflineList.Dat item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromOfflineList(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Games?.Game != null && item.Games.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Games.Game.Select(ConvertMachineFromOfflineList).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Games.Game.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,7 +30,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OfflineList.Dat"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromOfflineList(Models.OfflineList.Dat item)
+        private static Header ConvertHeaderToInternalModel(Models.OfflineList.Dat item)
         {
             var header = new Header
             {
@@ -63,7 +63,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OfflineList.Game"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromOfflineList(Models.OfflineList.Game item)
+        private static Machine ConvertMachineToInternalModel(Models.OfflineList.Game item)
         {
             var machine = new Machine
             {
@@ -86,7 +86,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var file in item.Files.RomCRC)
                 {
-                    var rom = ConvertFromOfflineList(file);
+                    var rom = ConvertToInternalModel(file);
                     rom[Rom.SizeKey] = item.RomSize;
                     roms.Add(rom);
                 }
@@ -99,7 +99,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OfflineList.FileRomCRC"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromOfflineList(Models.OfflineList.FileRomCRC item)
+        private static Rom ConvertToInternalModel(Models.OfflineList.FileRomCRC item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.OpenMSX.cs b/SabreTools.Serialization/Internal.OpenMSX.cs
index 576f4430..f29ed5e3 100644
--- a/SabreTools.Serialization/Internal.OpenMSX.cs
+++ b/SabreTools.Serialization/Internal.OpenMSX.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromOpenMSX(Models.OpenMSX.SoftwareDb item)
+        public static MetadataFile ConvertToInternalModel(Models.OpenMSX.SoftwareDb item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromOpenMSX(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Software != null && item.Software.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Software.Select(ConvertMachineFromOpenMSX).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Software.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,7 +30,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="Header"/>
         /// </summary>
-        public static Header ConvertHeaderFromOpenMSX(Models.OpenMSX.SoftwareDb item)
+        public static Header ConvertHeaderToInternalModel(Models.OpenMSX.SoftwareDb item)
         {
             var header = new Header
             {
@@ -42,7 +42,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OpenMSX.Software"/> to <cref="Machine"/>
         /// </summary>
-        public static Machine ConvertMachineFromOpenMSX(Models.OpenMSX.Software item)
+        public static Machine ConvertMachineToInternalModel(Models.OpenMSX.Software item)
         {
             var machine = new Machine
             {
@@ -59,7 +59,7 @@ namespace SabreTools.Serialization
                 var dumps = new List<Dump>();
                 foreach (var dump in item.Dump)
                 {
-                    dumps.Add(ConvertFromOpenMSX(dump));
+                    dumps.Add(ConvertToInternalModel(dump));
                 }
                 machine[Machine.DumpKey] = dumps.ToArray();
             }
@@ -70,25 +70,25 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OpenMSX.Dump"/> to <cref="Dump"/>
         /// </summary>
-        public static Dump ConvertFromOpenMSX(Models.OpenMSX.Dump item)
+        public static Dump ConvertToInternalModel(Models.OpenMSX.Dump item)
         {
             var dump = new Dump();
 
             if (item.Original != null)
-                dump[Dump.OriginalKey] = ConvertFromOpenMSX(item.Original);
+                dump[Dump.OriginalKey] = ConvertToInternalModel(item.Original);
 
             switch (item.Rom)
             {
                 case Models.OpenMSX.Rom rom:
-                    dump[Dump.RomKey] = ConvertFromOpenMSX(rom);
+                    dump[Dump.RomKey] = ConvertToInternalModel(rom);
                     break;
 
                 case Models.OpenMSX.MegaRom megaRom:
-                    dump[Dump.MegaRomKey] = ConvertFromOpenMSX(megaRom);
+                    dump[Dump.MegaRomKey] = ConvertToInternalModel(megaRom);
                     break;
 
                 case Models.OpenMSX.SCCPlusCart sccPlusCart:
-                    dump[Dump.SCCPlusCartKey] = ConvertFromOpenMSX(sccPlusCart);
+                    dump[Dump.SCCPlusCartKey] = ConvertToInternalModel(sccPlusCart);
                     break;
             }
 
@@ -98,7 +98,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OpenMSX.Original"/> to <cref="Rom"/>
         /// </summary>
-        public static Original ConvertFromOpenMSX(Models.OpenMSX.Original item)
+        public static Original ConvertToInternalModel(Models.OpenMSX.Original item)
         {
             var original = new Original
             {
@@ -111,7 +111,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.OpenMSX.RomBase"/> to <cref="Rom"/>
         /// </summary>
-        public static Rom ConvertFromOpenMSX(Models.OpenMSX.RomBase item)
+        public static Rom ConvertToInternalModel(Models.OpenMSX.RomBase item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.RomCenter.cs b/SabreTools.Serialization/Internal.RomCenter.cs
index f8e2e672..2b3f52ac 100644
--- a/SabreTools.Serialization/Internal.RomCenter.cs
+++ b/SabreTools.Serialization/Internal.RomCenter.cs
@@ -13,15 +13,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.RomCenter.MetadataFile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromRomCenter(Models.RomCenter.MetadataFile item)
+        public static MetadataFile ConvertToInternalModel(Models.RomCenter.MetadataFile item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromRomCenter(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Games?.Rom != null && item.Games.Rom.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Games.Rom.Select(ConvertMachineFromRomCenter).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Games.Rom.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -29,7 +29,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.RomCenter.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromRomCenter(Models.RomCenter.MetadataFile item)
+        private static Header ConvertHeaderToInternalModel(Models.RomCenter.MetadataFile item)
         {
             var header = new Header();
 
@@ -67,7 +67,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.RomCenter.Game"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromRomCenter(Models.RomCenter.Rom item)
+        private static Machine ConvertMachineToInternalModel(Models.RomCenter.Rom item)
         {
             var machine = new Machine
             {
@@ -75,7 +75,7 @@ namespace SabreTools.Serialization
                 //[Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable
                 [Machine.NameKey] = item.GameName,
                 [Machine.DescriptionKey] = item.GameDescription,
-                [Machine.RomKey] = new Rom[] { ConvertFromRomCenter(item) },
+                [Machine.RomKey] = new Rom[] { ConvertToInternalModel(item) },
             };
 
             return machine;
@@ -84,7 +84,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.RomCenter.Rom"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromRomCenter(Models.RomCenter.Rom item)
+        private static Rom ConvertToInternalModel(Models.RomCenter.Rom item)
         {
             var rom = new Rom
             {
diff --git a/SabreTools.Serialization/Internal.SeparatedValue.cs b/SabreTools.Serialization/Internal.SeparatedValue.cs
index 74b345f6..11899e48 100644
--- a/SabreTools.Serialization/Internal.SeparatedValue.cs
+++ b/SabreTools.Serialization/Internal.SeparatedValue.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SeparatedValue.MetadataFile"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromClrMamePro(Models.SeparatedValue.MetadataFile item)
+        public static MetadataFile ConvertToInternalModel(Models.SeparatedValue.MetadataFile item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromSeparatedValue(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Row != null && item.Row.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Row.Select(ConvertMachineFromSeparatedValue).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Row.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,7 +30,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SeparatedValue.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromSeparatedValue(Models.SeparatedValue.MetadataFile item)
+        private static Header ConvertHeaderToInternalModel(Models.SeparatedValue.MetadataFile item)
         {
             var header = new Header
             {
@@ -51,7 +51,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromSeparatedValue(Models.SeparatedValue.Row item)
+        private static Machine ConvertMachineToInternalModel(Models.SeparatedValue.Row item)
         {
             var machine = new Machine
             {
@@ -59,7 +59,7 @@ namespace SabreTools.Serialization
                 [Machine.DescriptionKey] = item.GameDescription,
             };
 
-            var datItem = ConvertFromSeparatedValue(item);
+            var datItem = ConvertToInternalModel(item);
             switch (datItem)
             {
                 case Disk disk:
@@ -81,7 +81,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="DatItem"/>
         /// </summary>
-        private static DatItem? ConvertFromSeparatedValue(Models.SeparatedValue.Row item)
+        private static DatItem? ConvertToInternalModel(Models.SeparatedValue.Row item)
         {
             return item.Type switch
             {
diff --git a/SabreTools.Serialization/Internal.SoftwareList.cs b/SabreTools.Serialization/Internal.SoftwareList.cs
index 64853d90..e18c4cd5 100644
--- a/SabreTools.Serialization/Internal.SoftwareList.cs
+++ b/SabreTools.Serialization/Internal.SoftwareList.cs
@@ -14,15 +14,15 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.SoftwareList"/> to <cref="MetadataFile"/>
         /// </summary>
-        public static MetadataFile ConvertFromSoftwareList(Models.SoftwareList.SoftwareList item)
+        public static MetadataFile ConvertToInternalModel(Models.SoftwareList.SoftwareList item)
         {
             var metadataFile = new MetadataFile
             {
-                [MetadataFile.HeaderKey] = ConvertHeaderFromSoftwareList(item),
+                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
             };
 
             if (item?.Software != null && item.Software.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Software.Select(ConvertMachineFromSoftwareList).ToArray();
+                metadataFile[MetadataFile.MachineKey] = item.Software.Select(ConvertMachineToInternalModel).ToArray();
 
             return metadataFile;
         }
@@ -30,7 +30,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.SoftwareList"/> to <cref="Header"/>
         /// </summary>
-        private static Header ConvertHeaderFromSoftwareList(Models.SoftwareList.SoftwareList item)
+        private static Header ConvertHeaderToInternalModel(Models.SoftwareList.SoftwareList item)
         {
             var header = new Header
             {
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.Software"/> to <cref="Machine"/>
         /// </summary>
-        private static Machine ConvertMachineFromSoftwareList(Models.SoftwareList.Software item)
+        private static Machine ConvertMachineToInternalModel(Models.SoftwareList.Software item)
         {
             var machine = new Machine
             {
@@ -62,7 +62,7 @@ namespace SabreTools.Serialization
                 var infos = new List<Info>();
                 foreach (var info in item.Info)
                 {
-                    infos.Add(ConvertFromSoftwareList(info));
+                    infos.Add(ConvertToInternalModel(info));
                 }
                 machine[Machine.InfoKey] = infos.ToArray();
             }
@@ -72,7 +72,7 @@ namespace SabreTools.Serialization
                 var sharedFeats = new List<SharedFeat>();
                 foreach (var sharedFeat in item.SharedFeat)
                 {
-                    sharedFeats.Add(ConvertFromSoftwareList(sharedFeat));
+                    sharedFeats.Add(ConvertToInternalModel(sharedFeat));
                 }
                 machine[Machine.SharedFeatKey] = sharedFeats.ToArray();
             }
@@ -82,7 +82,7 @@ namespace SabreTools.Serialization
                 var parts = new List<Part>();
                 foreach (var part in item.Part)
                 {
-                    parts.Add(ConvertFromSoftwareList(part));
+                    parts.Add(ConvertToInternalModel(part));
                 }
                 machine[Machine.PartKey] = parts.ToArray();
             }
@@ -93,7 +93,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.DataArea"/> to <cref="DataArea"/>
         /// </summary>
-        private static DataArea ConvertFromSoftwareList(Models.SoftwareList.DataArea item)
+        private static DataArea ConvertToInternalModel(Models.SoftwareList.DataArea item)
         {
             var dataArea = new DataArea
             {
@@ -108,7 +108,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
-                    roms.Add(ConvertFromSoftwareList(rom));
+                    roms.Add(ConvertToInternalModel(rom));
                 }
                 dataArea[DataArea.RomKey] = roms.ToArray();
             }
@@ -119,7 +119,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.DipSwitch"/> to <cref="DipSwitch"/>
         /// </summary>
-        private static DipSwitch ConvertFromSoftwareList(Models.SoftwareList.DipSwitch item)
+        private static DipSwitch ConvertToInternalModel(Models.SoftwareList.DipSwitch item)
         {
             var dipSwitch = new DipSwitch
             {
@@ -133,7 +133,7 @@ namespace SabreTools.Serialization
                 var dipValues = new List<DipValue>();
                 foreach (var dipValue in item.DipValue)
                 {
-                    dipValues.Add(ConvertFromSoftwareList(dipValue));
+                    dipValues.Add(ConvertToInternalModel(dipValue));
                 }
                 dipSwitch[DipSwitch.DipValueKey] = dipValues.ToArray();
             }
@@ -144,7 +144,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.DipValue"/> to <cref="DipValue"/>
         /// </summary>
-        private static DipValue ConvertFromSoftwareList(Models.SoftwareList.DipValue item)
+        private static DipValue ConvertToInternalModel(Models.SoftwareList.DipValue item)
         {
             var dipValue = new DipValue
             {
@@ -158,7 +158,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.Disk"/> to <cref="Disk"/>
         /// </summary>
-        private static Disk ConvertFromSoftwareList(Models.SoftwareList.Disk item)
+        private static Disk ConvertToInternalModel(Models.SoftwareList.Disk item)
         {
             var disk = new Disk
             {
@@ -174,7 +174,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.DiskArea"/> to <cref="DiskArea"/>
         /// </summary>
-        private static DiskArea ConvertFromSoftwareList(Models.SoftwareList.DiskArea item)
+        private static DiskArea ConvertToInternalModel(Models.SoftwareList.DiskArea item)
         {
             var diskArea = new DiskArea
             {
@@ -186,7 +186,7 @@ namespace SabreTools.Serialization
                 var roms = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
-                    roms.Add(ConvertFromSoftwareList(disk));
+                    roms.Add(ConvertToInternalModel(disk));
                 }
                 diskArea[DiskArea.DiskKey] = roms.ToArray();
             }
@@ -197,7 +197,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.Feature"/> to <cref="Feature"/>
         /// </summary>
-        private static Feature ConvertFromSoftwareList(Models.SoftwareList.Feature item)
+        private static Feature ConvertToInternalModel(Models.SoftwareList.Feature item)
         {
             var feature = new Feature
             {
@@ -210,7 +210,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.Info"/> to <cref="Info"/>
         /// </summary>
-        private static Info ConvertFromSoftwareList(Models.SoftwareList.Info item)
+        private static Info ConvertToInternalModel(Models.SoftwareList.Info item)
         {
             var info = new Info
             {
@@ -223,7 +223,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.Part"/> to <cref="Part"/>
         /// </summary>
-        private static Part ConvertFromSoftwareList(Models.SoftwareList.Part item)
+        private static Part ConvertToInternalModel(Models.SoftwareList.Part item)
         {
             var part = new Part
             {
@@ -236,7 +236,7 @@ namespace SabreTools.Serialization
                 var features = new List<Feature>();
                 foreach (var feature in item.Feature)
                 {
-                    features.Add(ConvertFromSoftwareList(feature));
+                    features.Add(ConvertToInternalModel(feature));
                 }
                 part[Part.FeatureKey] = features.ToArray();
             }
@@ -246,7 +246,7 @@ namespace SabreTools.Serialization
                 var dataAreas = new List<DataArea>();
                 foreach (var dataArea in item.DataArea)
                 {
-                    dataAreas.Add(ConvertFromSoftwareList(dataArea));
+                    dataAreas.Add(ConvertToInternalModel(dataArea));
                 }
                 part[Part.DataAreaKey] = dataAreas.ToArray();
             }
@@ -256,7 +256,7 @@ namespace SabreTools.Serialization
                 var diskAreas = new List<DiskArea>();
                 foreach (var diskArea in item.DiskArea)
                 {
-                    diskAreas.Add(ConvertFromSoftwareList(diskArea));
+                    diskAreas.Add(ConvertToInternalModel(diskArea));
                 }
                 part[Part.DiskAreaKey] = diskAreas.ToArray();
             }
@@ -266,7 +266,7 @@ namespace SabreTools.Serialization
                 var dipSwitches = new List<DipSwitch>();
                 foreach (var rom in item.DipSwitch)
                 {
-                    dipSwitches.Add(ConvertFromSoftwareList(rom));
+                    dipSwitches.Add(ConvertToInternalModel(rom));
                 }
                 part[Part.DipSwitchKey] = dipSwitches.ToArray();
             }
@@ -277,7 +277,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.Rom"/> to <cref="Rom"/>
         /// </summary>
-        private static Rom ConvertFromSoftwareList(Models.SoftwareList.Rom item)
+        private static Rom ConvertToInternalModel(Models.SoftwareList.Rom item)
         {
             var rom = new Rom
             {
@@ -297,7 +297,7 @@ namespace SabreTools.Serialization
         /// <summary>
         /// Convert from <cref="Models.SoftwareList.SharedFeat"/> to <cref="SharedFeat"/>
         /// </summary>
-        private static SharedFeat ConvertFromSoftwareList(Models.SoftwareList.SharedFeat item)
+        private static SharedFeat ConvertToInternalModel(Models.SoftwareList.SharedFeat item)
         {
             var sharedFeat = new SharedFeat
             {