diff --git a/README.MD b/README.MD
index cde61d29..a3bcfd68 100644
--- a/README.MD
+++ b/README.MD
@@ -84,14 +84,14 @@ Below is a table representing the various conversion interfaces that are impleme
 
 | Interface Name | Source Type | Destination Type |
 | --- | --- | --- |
-| `IByteDeserializer` | `byte[]?` | Model |
+| `IByteReader` | `byte[]?` | Model |
 | `IByteSerializer` | Model | `byte[]?` |
-| `IFileDeserializer` | `string?` path | Model |
+| `IFileReader` | `string?` path | Model |
 | `IFileSerializer` | Model | `string?` path |
 | `IModelSerializer` | Model | Model |
-| `IStreamDeserializer` | `Stream?` | Model |
+| `IStreamReader` | `Stream?` | Model |
 | `IStreamSerializer` | Model | `Stream?` |
-| `IStringDeserializer` | `string?` representation | Model |
+| `IStringReader` | `string?` representation | Model |
 | `IStringSerializer` | Model | `string?` representation |
 
 Below is a table representing the various non-conversion interfaces that are implemented within this library.
diff --git a/SabreTools.Serialization/Interfaces/IByteDeserializer.cs b/SabreTools.Serialization/Interfaces/IByteReader.cs
similarity index 85%
rename from SabreTools.Serialization/Interfaces/IByteDeserializer.cs
rename to SabreTools.Serialization/Interfaces/IByteReader.cs
index 1905c39d..5823f2bc 100644
--- a/SabreTools.Serialization/Interfaces/IByteDeserializer.cs
+++ b/SabreTools.Serialization/Interfaces/IByteReader.cs
@@ -1,9 +1,9 @@
 namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
-    /// Defines how to deserialize from byte arrays
+    /// Defines how to read from byte arrays
     /// </summary>
-    public interface IByteDeserializer<T>
+    public interface IByteReader<T>
     {
         /// <summary>
         /// Deserialize a byte array into <typeparamref name="T"/>
diff --git a/SabreTools.Serialization/Interfaces/IFileDeserializer.cs b/SabreTools.Serialization/Interfaces/IFileDeserializer.cs
index 8e689286..706a3aa3 100644
--- a/SabreTools.Serialization/Interfaces/IFileDeserializer.cs
+++ b/SabreTools.Serialization/Interfaces/IFileDeserializer.cs
@@ -1,9 +1,9 @@
 namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
-    /// Defines how to deserialize from files
+    /// Defines how to read from files
     /// </summary>
-    public interface IFileDeserializer<T>
+    public interface IFileReader<T>
     {
         /// <summary>
         /// Deserialize a file into <typeparamref name="T"/>
diff --git a/SabreTools.Serialization/Interfaces/IStreamDeserializer.cs b/SabreTools.Serialization/Interfaces/IStreamDeserializer.cs
index 47658193..65f18b82 100644
--- a/SabreTools.Serialization/Interfaces/IStreamDeserializer.cs
+++ b/SabreTools.Serialization/Interfaces/IStreamDeserializer.cs
@@ -1,9 +1,9 @@
 namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
-    /// Defines how to serialize from Streams
+    /// Defines how to read from Streams
     /// </summary>
-    public interface IStreamDeserializer<T>
+    public interface IStreamReader<T>
     {
         /// <summary>
         /// Deserialize a Stream into <typeparamref name="T"/>
diff --git a/SabreTools.Serialization/Interfaces/IStringDeserializer.cs b/SabreTools.Serialization/Interfaces/IStringDeserializer.cs
index 3079034d..d029dade 100644
--- a/SabreTools.Serialization/Interfaces/IStringDeserializer.cs
+++ b/SabreTools.Serialization/Interfaces/IStringDeserializer.cs
@@ -1,9 +1,9 @@
 namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
-    /// Defines how to serialize from strings
+    /// Defines how to read from strings
     /// </summary>
-    public interface IStringDeserializer<T>
+    public interface IStringReader<T>
     {
         /// <summary>
         /// Deserialize a string into <typeparamref name="T"/>
diff --git a/SabreTools.Serialization/Readers/AACS.cs b/SabreTools.Serialization/Readers/AACS.cs
index 52b3ba4a..f15c7cb4 100644
--- a/SabreTools.Serialization/Readers/AACS.cs
+++ b/SabreTools.Serialization/Readers/AACS.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class AACS : BaseBinaryDeserializer<MediaKeyBlock>
+    public class AACS : BaseBinaryReader<MediaKeyBlock>
     {
         /// <inheritdoc/>
         public override MediaKeyBlock? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/AbstractSyntaxNotationOne.cs b/SabreTools.Serialization/Readers/AbstractSyntaxNotationOne.cs
index ccf0dcfb..cc15142c 100644
--- a/SabreTools.Serialization/Readers/AbstractSyntaxNotationOne.cs
+++ b/SabreTools.Serialization/Readers/AbstractSyntaxNotationOne.cs
@@ -5,7 +5,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class AbstractSyntaxNotationOne : BaseBinaryDeserializer<TypeLengthValue[]>
+    public class AbstractSyntaxNotationOne : BaseBinaryReader<TypeLengthValue[]>
     {
         /// <inheritdoc/>
         public override TypeLengthValue[]? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/AppPkgHeader.cs b/SabreTools.Serialization/Readers/AppPkgHeader.cs
index da8ee3bc..17f913ea 100644
--- a/SabreTools.Serialization/Readers/AppPkgHeader.cs
+++ b/SabreTools.Serialization/Readers/AppPkgHeader.cs
@@ -5,7 +5,7 @@ using static SabreTools.Data.Models.PlayStation4.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class AppPkgHeader : BaseBinaryDeserializer<Data.Models.PlayStation4.AppPkgHeader>
+    public class AppPkgHeader : BaseBinaryReader<Data.Models.PlayStation4.AppPkgHeader>
     {
         /// <inheritdoc/>
         public override Data.Models.PlayStation4.AppPkgHeader? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/AttractMode.cs b/SabreTools.Serialization/Readers/AttractMode.cs
index cdd21b10..f534c85d 100644
--- a/SabreTools.Serialization/Readers/AttractMode.cs
+++ b/SabreTools.Serialization/Readers/AttractMode.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Readers;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class AttractMode : BaseBinaryDeserializer<MetadataFile>
+    public class AttractMode : BaseBinaryReader<MetadataFile>
     {
         #region Constants
 
@@ -16,7 +16,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IStreamDeserializer
+        #region IStreamReader
 
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/BDPlus.cs b/SabreTools.Serialization/Readers/BDPlus.cs
index 0adf178d..8344347f 100644
--- a/SabreTools.Serialization/Readers/BDPlus.cs
+++ b/SabreTools.Serialization/Readers/BDPlus.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.BDPlus.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class BDPlus : BaseBinaryDeserializer<SVM>
+    public class BDPlus : BaseBinaryReader<SVM>
     {
         /// <inheritdoc/>
         public override SVM? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/BFPK.cs b/SabreTools.Serialization/Readers/BFPK.cs
index 15740547..5280864e 100644
--- a/SabreTools.Serialization/Readers/BFPK.cs
+++ b/SabreTools.Serialization/Readers/BFPK.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.BFPK.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class BFPK : BaseBinaryDeserializer<Archive>
+    public class BFPK : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/BSP.cs b/SabreTools.Serialization/Readers/BSP.cs
index 9fa6e24c..22b8f3bd 100644
--- a/SabreTools.Serialization/Readers/BSP.cs
+++ b/SabreTools.Serialization/Readers/BSP.cs
@@ -8,7 +8,7 @@ using static SabreTools.Data.Models.BSP.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class BSP : BaseBinaryDeserializer<BspFile>
+    public class BSP : BaseBinaryReader<BspFile>
     {
         /// <inheritdoc/>
         public override BspFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/BaseBinaryDeserializer.cs b/SabreTools.Serialization/Readers/BaseBinaryDeserializer.cs
index 82f9b5bd..e36fa695 100644
--- a/SabreTools.Serialization/Readers/BaseBinaryDeserializer.cs
+++ b/SabreTools.Serialization/Readers/BaseBinaryDeserializer.cs
@@ -8,15 +8,15 @@ namespace SabreTools.Serialization.Readers
     /// </summary>
     /// <typeparam name="TModel">Type of the model to deserialize</typeparam>
     /// <remarks>
-    /// This class allows all inheriting types to only implement <see cref="IStreamDeserializer<>"/>
-    /// and still implicitly implement <see cref="IByteDeserializer<>"/>  and <see cref="IFileDeserializer<>"/> 
+    /// This class allows all inheriting types to only implement <see cref="IStreamReader<>"/>
+    /// and still implicitly implement <see cref="IByteReader<>"/>  and <see cref="IFileReader<>"/> 
     /// </remarks>
-    public abstract class BaseBinaryDeserializer<TModel> :
-        IByteDeserializer<TModel>,
-        IFileDeserializer<TModel>,
-        IStreamDeserializer<TModel>
+    public abstract class BaseBinaryReader<TModel> :
+        IByteReader<TModel>,
+        IFileReader<TModel>,
+        IStreamReader<TModel>
     {
-        #region IByteDeserializer
+        #region IByteReader
 
         /// <inheritdoc/>
         public virtual TModel? Deserialize(byte[]? data, int offset)
@@ -36,7 +36,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IFileDeserializer
+        #region IFileReader
 
         /// <inheritdoc/>
         public virtual TModel? Deserialize(string? path)
@@ -60,7 +60,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IStreamDeserializer
+        #region IStreamReader
 
         /// <inheritdoc/>
         public abstract TModel? Deserialize(Stream? data);
diff --git a/SabreTools.Serialization/Readers/CFB.cs b/SabreTools.Serialization/Readers/CFB.cs
index 1b621fed..ed226e27 100644
--- a/SabreTools.Serialization/Readers/CFB.cs
+++ b/SabreTools.Serialization/Readers/CFB.cs
@@ -9,7 +9,7 @@ using static SabreTools.Data.Models.CFB.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class CFB : BaseBinaryDeserializer<Binary>
+    public class CFB : BaseBinaryReader<Binary>
     {
         /// <inheritdoc/>
         public override Binary? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/CHD.cs b/SabreTools.Serialization/Readers/CHD.cs
index 9a71e095..5edf9a8e 100644
--- a/SabreTools.Serialization/Readers/CHD.cs
+++ b/SabreTools.Serialization/Readers/CHD.cs
@@ -7,7 +7,7 @@ using SabreTools.IO.Extensions;
 namespace SabreTools.Serialization.Readers
 {
     // TODO: Expand this to full CHD files eventually
-    public class CHD : BaseBinaryDeserializer<Header>
+    public class CHD : BaseBinaryReader<Header>
     {
         /// <inheritdoc/>
         public override Header? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/CIA.cs b/SabreTools.Serialization/Readers/CIA.cs
index 38d10faf..26e7c4df 100644
--- a/SabreTools.Serialization/Readers/CIA.cs
+++ b/SabreTools.Serialization/Readers/CIA.cs
@@ -5,7 +5,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class CIA : BaseBinaryDeserializer<Data.Models.N3DS.CIA>
+    public class CIA : BaseBinaryReader<Data.Models.N3DS.CIA>
     {
         /// <inheritdoc/>
         public override Data.Models.N3DS.CIA? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/Catalog.cs b/SabreTools.Serialization/Readers/Catalog.cs
index d57e24a7..80617304 100644
--- a/SabreTools.Serialization/Readers/Catalog.cs
+++ b/SabreTools.Serialization/Readers/Catalog.cs
@@ -5,7 +5,7 @@ namespace SabreTools.Serialization.Readers
 {
     public class Catalog : JsonFile<Data.Models.Xbox.Catalog>
     {
-        #region IByteDeserializer
+        #region IByteReader
 
         /// <remarks>Catalog.js file is encoded as UTF-16 LE</remarks>
         public override Data.Models.Xbox.Catalog? Deserialize(byte[]? data, int offset)
@@ -13,7 +13,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IFileDeserializer
+        #region IFileReader
 
         /// <remarks>Catalog.js file is encoded as UTF-16 LE</remarks>
         public override Data.Models.Xbox.Catalog? Deserialize(string? path)
@@ -21,7 +21,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IStreamDeserializer
+        #region IStreamReader
 
         /// <remarks>Catalog.js file is encoded as UTF-16 LE</remarks>
         public override Data.Models.Xbox.Catalog? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/ClrMamePro.cs b/SabreTools.Serialization/Readers/ClrMamePro.cs
index f52b0b85..9f6b575c 100644
--- a/SabreTools.Serialization/Readers/ClrMamePro.cs
+++ b/SabreTools.Serialization/Readers/ClrMamePro.cs
@@ -7,9 +7,9 @@ using SabreTools.IO.Readers;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class ClrMamePro : BaseBinaryDeserializer<MetadataFile>
+    public class ClrMamePro : BaseBinaryReader<MetadataFile>
     {
-        #region IByteDeserializer
+        #region IByteReader
 
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(byte[]? data, int offset)
@@ -33,7 +33,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IFileDeserializer
+        #region IFileReader
 
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(string? path)
@@ -61,7 +61,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IStreamDeserializer
+        #region IStreamReader
 
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/CueSheet.cs b/SabreTools.Serialization/Readers/CueSheet.cs
index 98fbdfdb..e6a3e5db 100644
--- a/SabreTools.Serialization/Readers/CueSheet.cs
+++ b/SabreTools.Serialization/Readers/CueSheet.cs
@@ -7,7 +7,7 @@ using SabreTools.Data.Models.CueSheets;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class CueSheet : BaseBinaryDeserializer<Data.Models.CueSheets.CueSheet>
+    public class CueSheet : BaseBinaryReader<Data.Models.CueSheets.CueSheet>
     {
         /// <inheritdoc/>
         public override Data.Models.CueSheets.CueSheet? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/DosCenter.cs b/SabreTools.Serialization/Readers/DosCenter.cs
index 0637f40a..cb2b806d 100644
--- a/SabreTools.Serialization/Readers/DosCenter.cs
+++ b/SabreTools.Serialization/Readers/DosCenter.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Readers;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class DosCenter : BaseBinaryDeserializer<MetadataFile>
+    public class DosCenter : BaseBinaryReader<MetadataFile>
     {
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/EverdriveSMDB.cs b/SabreTools.Serialization/Readers/EverdriveSMDB.cs
index 3b6e4224..6d8fcbee 100644
--- a/SabreTools.Serialization/Readers/EverdriveSMDB.cs
+++ b/SabreTools.Serialization/Readers/EverdriveSMDB.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Readers;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class EverdriveSMDB : BaseBinaryDeserializer<MetadataFile>
+    public class EverdriveSMDB : BaseBinaryReader<MetadataFile>
     {
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/GCF.cs b/SabreTools.Serialization/Readers/GCF.cs
index 735e264d..157fd48f 100644
--- a/SabreTools.Serialization/Readers/GCF.cs
+++ b/SabreTools.Serialization/Readers/GCF.cs
@@ -5,7 +5,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class GCF : BaseBinaryDeserializer<Data.Models.GCF.File>
+    public class GCF : BaseBinaryReader<Data.Models.GCF.File>
     {
         /// <inheritdoc/>
         public override Data.Models.GCF.File? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/GZip.cs b/SabreTools.Serialization/Readers/GZip.cs
index 32610448..43d0a60d 100644
--- a/SabreTools.Serialization/Readers/GZip.cs
+++ b/SabreTools.Serialization/Readers/GZip.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.GZIP.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class GZip : BaseBinaryDeserializer<Archive>
+    public class GZip : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/Hashfile.cs b/SabreTools.Serialization/Readers/Hashfile.cs
index 4385bec0..597e3042 100644
--- a/SabreTools.Serialization/Readers/Hashfile.cs
+++ b/SabreTools.Serialization/Readers/Hashfile.cs
@@ -6,9 +6,9 @@ using SabreTools.Hashing;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class Hashfile : BaseBinaryDeserializer<Data.Models.Hashfile.Hashfile>
+    public class Hashfile : BaseBinaryReader<Data.Models.Hashfile.Hashfile>
     {
-        #region IByteDeserializer
+        #region IByteReader
 
         /// <inheritdoc/>
         public override Data.Models.Hashfile.Hashfile? Deserialize(byte[]? data, int offset)
@@ -32,7 +32,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IFileDeserializer
+        #region IFileReader
 
         /// <inheritdoc/>
         public override Data.Models.Hashfile.Hashfile? Deserialize(string? path)
@@ -60,7 +60,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IStreamDeserializer
+        #region IStreamReader
 
         public override Data.Models.Hashfile.Hashfile? Deserialize(Stream? data)
             => Deserialize(data, HashType.CRC32);
diff --git a/SabreTools.Serialization/Readers/IRD.cs b/SabreTools.Serialization/Readers/IRD.cs
index d905f94a..ca792278 100644
--- a/SabreTools.Serialization/Readers/IRD.cs
+++ b/SabreTools.Serialization/Readers/IRD.cs
@@ -4,7 +4,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class IRD : BaseBinaryDeserializer<Data.Models.IRD.File>
+    public class IRD : BaseBinaryReader<Data.Models.IRD.File>
     {
         /// <inheritdoc/>
         public override Data.Models.IRD.File? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/InstallShieldArchiveV3.cs b/SabreTools.Serialization/Readers/InstallShieldArchiveV3.cs
index 4766f443..b1586057 100644
--- a/SabreTools.Serialization/Readers/InstallShieldArchiveV3.cs
+++ b/SabreTools.Serialization/Readers/InstallShieldArchiveV3.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class InstallShieldArchiveV3 : BaseBinaryDeserializer<Archive>
+    public class InstallShieldArchiveV3 : BaseBinaryReader<Archive>
     {
         public override Archive? Deserialize(Stream? data)
         {
diff --git a/SabreTools.Serialization/Readers/InstallShieldCabinet.cs b/SabreTools.Serialization/Readers/InstallShieldCabinet.cs
index 6902114f..7c122036 100644
--- a/SabreTools.Serialization/Readers/InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/Readers/InstallShieldCabinet.cs
@@ -9,7 +9,7 @@ using static SabreTools.Data.Models.InstallShieldCabinet.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class InstallShieldCabinet : BaseBinaryDeserializer<Cabinet>
+    public class InstallShieldCabinet : BaseBinaryReader<Cabinet>
     {
         /// <inheritdoc/>
         public override Cabinet? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/JsonFile.cs b/SabreTools.Serialization/Readers/JsonFile.cs
index 87106b06..be497e50 100644
--- a/SabreTools.Serialization/Readers/JsonFile.cs
+++ b/SabreTools.Serialization/Readers/JsonFile.cs
@@ -8,9 +8,9 @@ namespace SabreTools.Serialization.Readers
     /// Base class for other JSON serializers
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public abstract class JsonFile<T> : BaseBinaryDeserializer<T>
+    public abstract class JsonFile<T> : BaseBinaryReader<T>
     {
-        #region IByteDeserializer
+        #region IByteReader
 
         /// <inheritdoc/>
         public override T? Deserialize(byte[]? data, int offset)
@@ -41,7 +41,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IFileDeserializer
+        #region IFileReader
 
         /// <inheritdoc/>
         public override T? Deserialize(string? path)
@@ -75,7 +75,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IStreamDeserializer
+        #region IStreamReader
 
         /// <inheritdoc/>
         public override T? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/LZKWAJ.cs b/SabreTools.Serialization/Readers/LZKWAJ.cs
index ae7a413a..015f64f6 100644
--- a/SabreTools.Serialization/Readers/LZKWAJ.cs
+++ b/SabreTools.Serialization/Readers/LZKWAJ.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.LZ.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class LZKWAJ : BaseBinaryDeserializer<KWAJFile>
+    public class LZKWAJ : BaseBinaryReader<KWAJFile>
     {
         /// <inheritdoc/>
         public override KWAJFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/LZQBasic.cs b/SabreTools.Serialization/Readers/LZQBasic.cs
index 40aa9b54..e2c8d89d 100644
--- a/SabreTools.Serialization/Readers/LZQBasic.cs
+++ b/SabreTools.Serialization/Readers/LZQBasic.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.LZ.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class LZQBasic : BaseBinaryDeserializer<QBasicFile>
+    public class LZQBasic : BaseBinaryReader<QBasicFile>
     {
         /// <inheritdoc/>
         public override QBasicFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/LZSZDD.cs b/SabreTools.Serialization/Readers/LZSZDD.cs
index c887ebca..81d5a606 100644
--- a/SabreTools.Serialization/Readers/LZSZDD.cs
+++ b/SabreTools.Serialization/Readers/LZSZDD.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.LZ.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class LZSZDD : BaseBinaryDeserializer<SZDDFile>
+    public class LZSZDD : BaseBinaryReader<SZDDFile>
     {
         /// <inheritdoc/>
         public override SZDDFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/LinearExecutable.cs b/SabreTools.Serialization/Readers/LinearExecutable.cs
index c78c4697..62846e3a 100644
--- a/SabreTools.Serialization/Readers/LinearExecutable.cs
+++ b/SabreTools.Serialization/Readers/LinearExecutable.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.LinearExecutable.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class LinearExecutable : BaseBinaryDeserializer<Executable>
+    public class LinearExecutable : BaseBinaryReader<Executable>
     {
         /// <inheritdoc/>
         public override Executable? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/Listrom.cs b/SabreTools.Serialization/Readers/Listrom.cs
index 77c05438..17f80575 100644
--- a/SabreTools.Serialization/Readers/Listrom.cs
+++ b/SabreTools.Serialization/Readers/Listrom.cs
@@ -6,7 +6,7 @@ using SabreTools.Data.Models.Listrom;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class Listrom : BaseBinaryDeserializer<MetadataFile>
+    public class Listrom : BaseBinaryReader<MetadataFile>
     {
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/MSDOS.cs b/SabreTools.Serialization/Readers/MSDOS.cs
index cae9131c..9e8aa847 100644
--- a/SabreTools.Serialization/Readers/MSDOS.cs
+++ b/SabreTools.Serialization/Readers/MSDOS.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.MSDOS.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class MSDOS : BaseBinaryDeserializer<Executable>
+    public class MSDOS : BaseBinaryReader<Executable>
     {
         /// <inheritdoc/>
         public override Executable? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/MicrosoftCabinet.cs b/SabreTools.Serialization/Readers/MicrosoftCabinet.cs
index 1ee10128..dc728b4a 100644
--- a/SabreTools.Serialization/Readers/MicrosoftCabinet.cs
+++ b/SabreTools.Serialization/Readers/MicrosoftCabinet.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.MicrosoftCabinet.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class MicrosoftCabinet : BaseBinaryDeserializer<Cabinet>
+    public class MicrosoftCabinet : BaseBinaryReader<Cabinet>
     {
         /// <inheritdoc/>
         public override Cabinet? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/MoPaQ.cs b/SabreTools.Serialization/Readers/MoPaQ.cs
index 3ef65e33..9d9d4b9e 100644
--- a/SabreTools.Serialization/Readers/MoPaQ.cs
+++ b/SabreTools.Serialization/Readers/MoPaQ.cs
@@ -8,7 +8,7 @@ using static SabreTools.Data.Models.MoPaQ.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class MoPaQ : BaseBinaryDeserializer<Archive>
+    public class MoPaQ : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/N3DS.cs b/SabreTools.Serialization/Readers/N3DS.cs
index 8026a9c2..dec7e5ed 100644
--- a/SabreTools.Serialization/Readers/N3DS.cs
+++ b/SabreTools.Serialization/Readers/N3DS.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.N3DS.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class N3DS : BaseBinaryDeserializer<Cart>
+    public class N3DS : BaseBinaryReader<Cart>
     {
         /// <inheritdoc/>
         public override Cart? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/NCF.cs b/SabreTools.Serialization/Readers/NCF.cs
index fe062547..c3a5a214 100644
--- a/SabreTools.Serialization/Readers/NCF.cs
+++ b/SabreTools.Serialization/Readers/NCF.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class NCF : BaseBinaryDeserializer<Data.Models.NCF.File>
+    public class NCF : BaseBinaryReader<Data.Models.NCF.File>
     {
         /// <inheritdoc/>
         public override Data.Models.NCF.File? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/NewExecutable.cs b/SabreTools.Serialization/Readers/NewExecutable.cs
index 26b29d98..dc3df703 100644
--- a/SabreTools.Serialization/Readers/NewExecutable.cs
+++ b/SabreTools.Serialization/Readers/NewExecutable.cs
@@ -8,7 +8,7 @@ using static SabreTools.Data.Models.NewExecutable.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class NewExecutable : BaseBinaryDeserializer<Executable>
+    public class NewExecutable : BaseBinaryReader<Executable>
     {
         /// <inheritdoc/>
         public override Executable? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/Nitro.cs b/SabreTools.Serialization/Readers/Nitro.cs
index f72b0172..be0a7d06 100644
--- a/SabreTools.Serialization/Readers/Nitro.cs
+++ b/SabreTools.Serialization/Readers/Nitro.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class Nitro : BaseBinaryDeserializer<Cart>
+    public class Nitro : BaseBinaryReader<Cart>
     {
         /// <inheritdoc/>
         public override Cart? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/PAK.cs b/SabreTools.Serialization/Readers/PAK.cs
index e66d49b7..a98efbcb 100644
--- a/SabreTools.Serialization/Readers/PAK.cs
+++ b/SabreTools.Serialization/Readers/PAK.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.PAK.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class PAK : BaseBinaryDeserializer<Data.Models.PAK.File>
+    public class PAK : BaseBinaryReader<Data.Models.PAK.File>
     {
         /// <inheritdoc/>
         public override Data.Models.PAK.File? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/PFF.cs b/SabreTools.Serialization/Readers/PFF.cs
index 25039d9e..1ff2fdd5 100644
--- a/SabreTools.Serialization/Readers/PFF.cs
+++ b/SabreTools.Serialization/Readers/PFF.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.PFF.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class PFF : BaseBinaryDeserializer<Archive>
+    public class PFF : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/PIC.cs b/SabreTools.Serialization/Readers/PIC.cs
index b69c3321..9c5a1d44 100644
--- a/SabreTools.Serialization/Readers/PIC.cs
+++ b/SabreTools.Serialization/Readers/PIC.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.PIC.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class PIC : BaseBinaryDeserializer<DiscInformation>
+    public class PIC : BaseBinaryReader<DiscInformation>
     {
         /// <inheritdoc/>
         public override DiscInformation? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/PKZIP.cs b/SabreTools.Serialization/Readers/PKZIP.cs
index 9fe5ff1a..b09a4488 100644
--- a/SabreTools.Serialization/Readers/PKZIP.cs
+++ b/SabreTools.Serialization/Readers/PKZIP.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.PKZIP.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class PKZIP : BaseBinaryDeserializer<Archive>
+    public class PKZIP : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/PlayJAudio.cs b/SabreTools.Serialization/Readers/PlayJAudio.cs
index 05242c7f..bb0a9379 100644
--- a/SabreTools.Serialization/Readers/PlayJAudio.cs
+++ b/SabreTools.Serialization/Readers/PlayJAudio.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.PlayJ.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class PlayJAudio : BaseBinaryDeserializer<AudioFile>
+    public class PlayJAudio : BaseBinaryReader<AudioFile>
     {
         /// <inheritdoc/>
         public override AudioFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/PlayJPlaylist.cs b/SabreTools.Serialization/Readers/PlayJPlaylist.cs
index 659bdcfa..680dd50b 100644
--- a/SabreTools.Serialization/Readers/PlayJPlaylist.cs
+++ b/SabreTools.Serialization/Readers/PlayJPlaylist.cs
@@ -4,7 +4,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class PlayJPlaylist : BaseBinaryDeserializer<Playlist>
+    public class PlayJPlaylist : BaseBinaryReader<Playlist>
     {
         /// <inheritdoc/>
         public override Playlist? Deserialize(Stream? data)
@@ -33,7 +33,7 @@ namespace SabreTools.Serialization.Readers
                 #region Audio Files
 
                 // Create the audio file deserializer
-                var audioDeserializer = new PlayJAudio();
+                var audioReader = new PlayJAudio();
 
                 // Create the audio files array
                 playlist.AudioFiles = new AudioFile[playlistHeader.TrackCount];
@@ -41,7 +41,7 @@ namespace SabreTools.Serialization.Readers
                 // Try to parse the audio files
                 for (int i = 0; i < playlist.AudioFiles.Length; i++)
                 {
-                    var entryHeader = audioDeserializer.Deserialize(data);
+                    var entryHeader = audioReader.Deserialize(data);
                     if (entryHeader == null)
                         continue;
 
diff --git a/SabreTools.Serialization/Readers/PortableExecutable.cs b/SabreTools.Serialization/Readers/PortableExecutable.cs
index 0c9e7a3e..2afb3ce3 100644
--- a/SabreTools.Serialization/Readers/PortableExecutable.cs
+++ b/SabreTools.Serialization/Readers/PortableExecutable.cs
@@ -12,7 +12,7 @@ using static SabreTools.Data.Models.PortableExecutable.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class PortableExecutable : BaseBinaryDeserializer<Executable>
+    public class PortableExecutable : BaseBinaryReader<Executable>
     {
         /// <inheritdoc/>
         public override Executable? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/Quantum.cs b/SabreTools.Serialization/Readers/Quantum.cs
index ac7309b7..80350de3 100644
--- a/SabreTools.Serialization/Readers/Quantum.cs
+++ b/SabreTools.Serialization/Readers/Quantum.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.Quantum.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class Quantum : BaseBinaryDeserializer<Archive>
+    public class Quantum : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/RomCenter.cs b/SabreTools.Serialization/Readers/RomCenter.cs
index 3234094c..db54ba3d 100644
--- a/SabreTools.Serialization/Readers/RomCenter.cs
+++ b/SabreTools.Serialization/Readers/RomCenter.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Readers;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class RomCenter : BaseBinaryDeserializer<MetadataFile>
+    public class RomCenter : BaseBinaryReader<MetadataFile>
     {
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/SFB.cs b/SabreTools.Serialization/Readers/SFB.cs
index b2fdc785..2afaccbb 100644
--- a/SabreTools.Serialization/Readers/SFB.cs
+++ b/SabreTools.Serialization/Readers/SFB.cs
@@ -5,7 +5,7 @@ using static SabreTools.Data.Models.PlayStation3.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class SFB : BaseBinaryDeserializer<Data.Models.PlayStation3.SFB>
+    public class SFB : BaseBinaryReader<Data.Models.PlayStation3.SFB>
     {
         /// <inheritdoc/>
         public override Data.Models.PlayStation3.SFB? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/SFO.cs b/SabreTools.Serialization/Readers/SFO.cs
index 7459f996..4ba34066 100644
--- a/SabreTools.Serialization/Readers/SFO.cs
+++ b/SabreTools.Serialization/Readers/SFO.cs
@@ -5,7 +5,7 @@ using static SabreTools.Data.Models.PlayStation3.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class SFO : BaseBinaryDeserializer<Data.Models.PlayStation3.SFO>
+    public class SFO : BaseBinaryReader<Data.Models.PlayStation3.SFO>
     {
         /// <inheritdoc/>
         public override Data.Models.PlayStation3.SFO? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/SGA.cs b/SabreTools.Serialization/Readers/SGA.cs
index 26cf6ceb..97f41071 100644
--- a/SabreTools.Serialization/Readers/SGA.cs
+++ b/SabreTools.Serialization/Readers/SGA.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.SGA.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class SGA : BaseBinaryDeserializer<Archive>
+    public class SGA : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/SecuROMAddD.cs b/SabreTools.Serialization/Readers/SecuROMAddD.cs
index cce5f146..2b081640 100644
--- a/SabreTools.Serialization/Readers/SecuROMAddD.cs
+++ b/SabreTools.Serialization/Readers/SecuROMAddD.cs
@@ -5,7 +5,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class SecuROMAddD : BaseBinaryDeserializer<AddD>
+    public class SecuROMAddD : BaseBinaryReader<AddD>
     {
         /// <inheritdoc/>
         public override AddD? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/SecuROMDFA.cs b/SabreTools.Serialization/Readers/SecuROMDFA.cs
index 6b0e74e4..e174d711 100644
--- a/SabreTools.Serialization/Readers/SecuROMDFA.cs
+++ b/SabreTools.Serialization/Readers/SecuROMDFA.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.SecuROM.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class SecuROMDFA : BaseBinaryDeserializer<DFAFile>
+    public class SecuROMDFA : BaseBinaryReader<DFAFile>
     {
         /// <inheritdoc/>
         public override DFAFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/SecuROMMatroschkaPackage.cs b/SabreTools.Serialization/Readers/SecuROMMatroschkaPackage.cs
index 2d672d83..1f45065c 100644
--- a/SabreTools.Serialization/Readers/SecuROMMatroschkaPackage.cs
+++ b/SabreTools.Serialization/Readers/SecuROMMatroschkaPackage.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.SecuROM.Constants;
 namespace SabreTools.Serialization.Readers
 {
     // TODO: Cache data blocks during parse
-    public class SecuROMMatroschkaPackage : BaseBinaryDeserializer<MatroshkaPackage>
+    public class SecuROMMatroschkaPackage : BaseBinaryReader<MatroshkaPackage>
     {
         /// <inheritdoc/>
         /// TODO: Unify matroschka spelling to "Matroschka"
diff --git a/SabreTools.Serialization/Readers/SeparatedValue.cs b/SabreTools.Serialization/Readers/SeparatedValue.cs
index 08f3aa81..a7d9066f 100644
--- a/SabreTools.Serialization/Readers/SeparatedValue.cs
+++ b/SabreTools.Serialization/Readers/SeparatedValue.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Readers;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class SeparatedValue : BaseBinaryDeserializer<MetadataFile>
+    public class SeparatedValue : BaseBinaryReader<MetadataFile>
     {
         #region Constants
 
@@ -16,7 +16,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IByteDeserializer
+        #region IByteReader
 
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(byte[]? data, int offset)
@@ -40,7 +40,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IFileDeserializer
+        #region IFileReader
 
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(string? path)
@@ -68,7 +68,7 @@ namespace SabreTools.Serialization.Readers
 
         #endregion
 
-        #region IStreamDeserializer
+        #region IStreamReader
 
         /// <inheritdoc/>
         public override MetadataFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/TapeArchive.cs b/SabreTools.Serialization/Readers/TapeArchive.cs
index 65ce0013..bc3af5a2 100644
--- a/SabreTools.Serialization/Readers/TapeArchive.cs
+++ b/SabreTools.Serialization/Readers/TapeArchive.cs
@@ -7,7 +7,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class TapeArchive : BaseBinaryDeserializer<Archive>
+    public class TapeArchive : BaseBinaryReader<Archive>
     {
         /// <inheritdoc/>
         public override Archive? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/VBSP.cs b/SabreTools.Serialization/Readers/VBSP.cs
index e9055d8b..e7666a62 100644
--- a/SabreTools.Serialization/Readers/VBSP.cs
+++ b/SabreTools.Serialization/Readers/VBSP.cs
@@ -9,7 +9,7 @@ using static SabreTools.Data.Models.BSP.Constants;
 // TODO: Finish replacing ReadType
 namespace SabreTools.Serialization.Readers
 {
-    public class VBSP : BaseBinaryDeserializer<VbspFile>
+    public class VBSP : BaseBinaryReader<VbspFile>
     {
         /// <inheritdoc/>
         public override VbspFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/VPK.cs b/SabreTools.Serialization/Readers/VPK.cs
index a996975c..e62303bd 100644
--- a/SabreTools.Serialization/Readers/VPK.cs
+++ b/SabreTools.Serialization/Readers/VPK.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.VPK.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class VPK : BaseBinaryDeserializer<Data.Models.VPK.File>
+    public class VPK : BaseBinaryReader<Data.Models.VPK.File>
     {
         /// <inheritdoc/>
         public override Data.Models.VPK.File? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/WAD3.cs b/SabreTools.Serialization/Readers/WAD3.cs
index 23fd496a..e9219d8f 100644
--- a/SabreTools.Serialization/Readers/WAD3.cs
+++ b/SabreTools.Serialization/Readers/WAD3.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.WAD3.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class WAD3 : BaseBinaryDeserializer<Data.Models.WAD3.File>
+    public class WAD3 : BaseBinaryReader<Data.Models.WAD3.File>
     {
         /// <inheritdoc/>
         public override Data.Models.WAD3.File? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/WiseOverlayHeader.cs b/SabreTools.Serialization/Readers/WiseOverlayHeader.cs
index 2a7ddca8..8542ad02 100644
--- a/SabreTools.Serialization/Readers/WiseOverlayHeader.cs
+++ b/SabreTools.Serialization/Readers/WiseOverlayHeader.cs
@@ -6,7 +6,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class WiseOverlayHeader : BaseBinaryDeserializer<OverlayHeader>
+    public class WiseOverlayHeader : BaseBinaryReader<OverlayHeader>
     {
         /// <inheritdoc/>
         public override OverlayHeader? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/WiseScript.cs b/SabreTools.Serialization/Readers/WiseScript.cs
index 99c4219a..2850fb45 100644
--- a/SabreTools.Serialization/Readers/WiseScript.cs
+++ b/SabreTools.Serialization/Readers/WiseScript.cs
@@ -7,7 +7,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class WiseScript : BaseBinaryDeserializer<ScriptFile>
+    public class WiseScript : BaseBinaryReader<ScriptFile>
     {
         /// <inheritdoc/>
         public override ScriptFile? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/WiseSectionHeader.cs b/SabreTools.Serialization/Readers/WiseSectionHeader.cs
index 24585f86..b2573247 100644
--- a/SabreTools.Serialization/Readers/WiseSectionHeader.cs
+++ b/SabreTools.Serialization/Readers/WiseSectionHeader.cs
@@ -7,7 +7,7 @@ using static SabreTools.Data.Models.WiseInstaller.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class WiseSectionHeader : BaseBinaryDeserializer<SectionHeader>
+    public class WiseSectionHeader : BaseBinaryReader<SectionHeader>
     {
         /// <inheritdoc/>
         public override SectionHeader? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/XMID.cs b/SabreTools.Serialization/Readers/XMID.cs
index f951afc9..2306b6b5 100644
--- a/SabreTools.Serialization/Readers/XMID.cs
+++ b/SabreTools.Serialization/Readers/XMID.cs
@@ -2,9 +2,9 @@ using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Readers
 {
-    public partial class XMID : IStringDeserializer<Data.Models.Xbox.XMID>
+    public partial class XMID : IStringReader<Data.Models.Xbox.XMID>
     {
-        /// <inheritdoc cref="IStringDeserializer.Deserialize(string?)"/>
+        /// <inheritdoc cref="IStringReader.Deserialize(string?)"/>
         public static Data.Models.Xbox.XMID? DeserializeString(string? str)
         {
             var deserializer = new XMID();
diff --git a/SabreTools.Serialization/Readers/XZP.cs b/SabreTools.Serialization/Readers/XZP.cs
index 38d3d56e..9a999a72 100644
--- a/SabreTools.Serialization/Readers/XZP.cs
+++ b/SabreTools.Serialization/Readers/XZP.cs
@@ -6,7 +6,7 @@ using static SabreTools.Data.Models.XZP.Constants;
 
 namespace SabreTools.Serialization.Readers
 {
-    public class XZP : BaseBinaryDeserializer<Data.Models.XZP.File>
+    public class XZP : BaseBinaryReader<Data.Models.XZP.File>
     {
         /// <inheritdoc/>
         public override Data.Models.XZP.File? Deserialize(Stream? data)
diff --git a/SabreTools.Serialization/Readers/XeMID.cs b/SabreTools.Serialization/Readers/XeMID.cs
index 755a6299..836b621e 100644
--- a/SabreTools.Serialization/Readers/XeMID.cs
+++ b/SabreTools.Serialization/Readers/XeMID.cs
@@ -2,9 +2,9 @@ using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Readers
 {
-    public partial class XeMID : IStringDeserializer<Data.Models.Xbox.XeMID>
+    public partial class XeMID : IStringReader<Data.Models.Xbox.XeMID>
     {
-        /// <inheritdoc cref="IStringDeserializer.Deserialize(string?)"/>
+        /// <inheritdoc cref="IStringReader.Deserialize(string?)"/>
         public static Data.Models.Xbox.XeMID? DeserializeString(string? str)
         {
             var deserializer = new XeMID();
diff --git a/SabreTools.Serialization/Readers/XmlFile.cs b/SabreTools.Serialization/Readers/XmlFile.cs
index 6cd75337..47d318cd 100644
--- a/SabreTools.Serialization/Readers/XmlFile.cs
+++ b/SabreTools.Serialization/Readers/XmlFile.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Serialization.Readers
     /// Base class for other XML deserializers
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public abstract class XmlFile<T> : BaseBinaryDeserializer<T>
+    public abstract class XmlFile<T> : BaseBinaryReader<T>
     {
         /// <inheritdoc/>
         public override T? Deserialize(Stream? data)