diff --git a/SabreTools.Serialization/Wrappers/BZip2.cs b/SabreTools.Serialization/Wrappers/BZip2.cs
index 0ed2bef9..a57b8f64 100644
--- a/SabreTools.Serialization/Wrappers/BZip2.cs
+++ b/SabreTools.Serialization/Wrappers/BZip2.cs
@@ -87,13 +87,13 @@ namespace SabreTools.Serialization.Wrappers
         /// <inheritdoc/>
         public bool Extract(string outputDirectory, bool includeDebug)
         {
-            if (DataSourceStream == null || !DataSourceStream.CanRead)
+            if (DataSource == null || !DataSource.CanRead)
                 return false;
 
             try
             {
                 // Try opening the stream
-                using var bz2File = new BZip2InputStream(DataSourceStream, true);
+                using var bz2File = new BZip2InputStream(DataSource, true);
 
                 // Ensure directory separators are consistent
                 string filename = Guid.NewGuid().ToString();
diff --git a/SabreTools.Serialization/Wrappers/GZip.cs b/SabreTools.Serialization/Wrappers/GZip.cs
index 0c959d24..18773b44 100644
--- a/SabreTools.Serialization/Wrappers/GZip.cs
+++ b/SabreTools.Serialization/Wrappers/GZip.cs
@@ -86,13 +86,13 @@ namespace SabreTools.Serialization.Wrappers
         /// <inheritdoc/>
         public bool Extract(string outputDirectory, bool includeDebug)
         {
-            if (DataSourceStream == null || !DataSourceStream.CanRead)
+            if (DataSource == null || !DataSource.CanRead)
                 return false;
 
             try
             {
                 // Try opening the stream
-                using var gzipFile = new GZipStream(DataSourceStream, CompressionMode.Decompress, true);
+                using var gzipFile = new GZipStream(DataSource, CompressionMode.Decompress, true);
 
                 // Ensure directory separators are consistent
                 string filename = Guid.NewGuid().ToString();
diff --git a/SabreTools.Serialization/Wrappers/PKZIP.cs b/SabreTools.Serialization/Wrappers/PKZIP.cs
index 8932c6bd..8f35addf 100644
--- a/SabreTools.Serialization/Wrappers/PKZIP.cs
+++ b/SabreTools.Serialization/Wrappers/PKZIP.cs
@@ -91,14 +91,14 @@ namespace SabreTools.Serialization.Wrappers
         /// <inheritdoc cref="Extract(string, bool)"/>
         public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebug)
         {
-            if (DataSourceStream == null || !DataSourceStream.CanRead)
+            if (DataSource == null || !DataSource.CanRead)
                 return false;
 
 #if NET462_OR_GREATER || NETCOREAPP
             try
             {
                 var readerOptions = new ReaderOptions() { LookForHeader = lookForHeader };
-                var zipFile = ZipArchive.Open(DataSourceStream, readerOptions);
+                var zipFile = ZipArchive.Open(DataSource, readerOptions);
 
                 // Try to read the file path if no entries are found
                 if (zipFile.Entries.Count == 0 && !string.IsNullOrEmpty(Filename) && File.Exists(Filename!))
diff --git a/SabreTools.Serialization/Wrappers/RAR.cs b/SabreTools.Serialization/Wrappers/RAR.cs
index 1104979b..2987332b 100644
--- a/SabreTools.Serialization/Wrappers/RAR.cs
+++ b/SabreTools.Serialization/Wrappers/RAR.cs
@@ -94,14 +94,14 @@ namespace SabreTools.Serialization.Wrappers
         /// <inheritdoc cref="Extract(string, bool)"/>
         public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebug)
         {
-            if (DataSourceStream == null || !DataSourceStream.CanRead)
+            if (DataSource == null || !DataSource.CanRead)
                 return false;
 
 #if NET462_OR_GREATER || NETCOREAPP
             try
             {
                 var readerOptions = new ReaderOptions() { LookForHeader = lookForHeader };
-                RarArchive rarFile = RarArchive.Open(DataSourceStream, readerOptions);
+                RarArchive rarFile = RarArchive.Open(DataSource, readerOptions);
 
                 // Try to read the file path if no entries are found
                 if (rarFile.Entries.Count == 0 && !string.IsNullOrEmpty(Filename) && File.Exists(Filename!))
diff --git a/SabreTools.Serialization/Wrappers/SevenZip.cs b/SabreTools.Serialization/Wrappers/SevenZip.cs
index 150fe4a5..ae67bc0b 100644
--- a/SabreTools.Serialization/Wrappers/SevenZip.cs
+++ b/SabreTools.Serialization/Wrappers/SevenZip.cs
@@ -94,14 +94,14 @@ namespace SabreTools.Serialization.Wrappers
         /// <inheritdoc cref="Extract(string, bool)"/>
         public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebug)
         {
-            if (DataSourceStream == null || !DataSourceStream.CanRead)
+            if (DataSource == null || !DataSource.CanRead)
                 return false;
 
 #if NET462_OR_GREATER || NETCOREAPP
             try
             {
                 var readerOptions = new ReaderOptions() { LookForHeader = lookForHeader };
-                var sevenZip = SevenZipArchive.Open(DataSourceStream, readerOptions);
+                var sevenZip = SevenZipArchive.Open(DataSource, readerOptions);
                 // Try to read the file path if no entries are found
                 if (sevenZip.Entries.Count == 0 && !string.IsNullOrEmpty(Filename) && File.Exists(Filename!))
                     sevenZip = SevenZipArchive.Open(Filename!, readerOptions);
diff --git a/SabreTools.Serialization/Wrappers/TapeArchive.cs b/SabreTools.Serialization/Wrappers/TapeArchive.cs
index b966a815..f125ac10 100644
--- a/SabreTools.Serialization/Wrappers/TapeArchive.cs
+++ b/SabreTools.Serialization/Wrappers/TapeArchive.cs
@@ -88,13 +88,13 @@ namespace SabreTools.Serialization.Wrappers
         /// <inheritdoc/>
         public bool Extract(string outputDirectory, bool includeDebug)
         {
-            if (DataSourceStream == null || !DataSourceStream.CanRead)
+            if (DataSource == null || !DataSource.CanRead)
                 return false;
 
 #if NET462_OR_GREATER || NETCOREAPP
             try
             {
-                var tarFile = TarArchive.Open(DataSourceStream);
+                var tarFile = TarArchive.Open(DataSource);
 
                 // Try to read the file path if no entries are found
                 if (tarFile.Entries.Count == 0 && !string.IsNullOrEmpty(Filename) && File.Exists(Filename!))
diff --git a/SabreTools.Serialization/Wrappers/WrapperBase.cs b/SabreTools.Serialization/Wrappers/WrapperBase.cs
index abce2e33..23e97dec 100644
--- a/SabreTools.Serialization/Wrappers/WrapperBase.cs
+++ b/SabreTools.Serialization/Wrappers/WrapperBase.cs
@@ -26,7 +26,7 @@ namespace SabreTools.Serialization.Wrappers
         /// <summary>
         /// Data source as a stream
         /// </summary>
-        public Stream? DataSourceStream => _dataSource;
+        public Stream? DataSource => _dataSource;
 
         /// <inheritdoc cref="ViewStream.Filename"/>
         public string? Filename => _dataSource.Filename;
diff --git a/SabreTools.Serialization/Wrappers/XZ.cs b/SabreTools.Serialization/Wrappers/XZ.cs
index b289d25d..90fad969 100644
--- a/SabreTools.Serialization/Wrappers/XZ.cs
+++ b/SabreTools.Serialization/Wrappers/XZ.cs
@@ -88,13 +88,13 @@ namespace SabreTools.Serialization.Wrappers
         public bool Extract(string outDir, bool includeDebug)
         {
 #if NET462_OR_GREATER || NETCOREAPP
-            if (DataSourceStream == null || !DataSourceStream.CanRead)
+            if (DataSource == null || !DataSource.CanRead)
                 return false;
 
             try
             {
                 // Try opening the stream
-                using var xzFile = new XZStream(DataSourceStream);
+                using var xzFile = new XZStream(DataSource);
 
                 // Ensure directory separators are consistent
                 string filename = System.Guid.NewGuid().ToString();