diff --git a/SabreTools.IO.Compression/SZDD/Decompressor.cs b/SabreTools.IO.Compression/SZDD/Decompressor.cs
index a08f9ab..37c5f4f 100644
--- a/SabreTools.IO.Compression/SZDD/Decompressor.cs
+++ b/SabreTools.IO.Compression/SZDD/Decompressor.cs
@@ -14,7 +14,7 @@ namespace SabreTools.IO.Compression.SZDD
         /// <summary>
         /// Source stream for the decompressor
         /// </summary>
-        private readonly BufferedStream _source;
+        private readonly BufferedStreamReader _source;
 
         /// <summary>
         /// SZDD format being decompressed
@@ -43,7 +43,7 @@ namespace SabreTools.IO.Compression.SZDD
 
             // Initialize the window with space characters
             _window = Array.ConvertAll(_window, b => (byte)0x20);
-            _source = new BufferedStream(source);
+            _source = new BufferedStreamReader(source);
         }
 
         /// <summary>
diff --git a/SabreTools.IO.Test/BufferedStreamTests.cs b/SabreTools.IO.Test/BufferedStreamReaderTests.cs
similarity index 79%
rename from SabreTools.IO.Test/BufferedStreamTests.cs
rename to SabreTools.IO.Test/BufferedStreamReaderTests.cs
index 706a554..58a5df8 100644
--- a/SabreTools.IO.Test/BufferedStreamTests.cs
+++ b/SabreTools.IO.Test/BufferedStreamReaderTests.cs
@@ -3,7 +3,7 @@ using Xunit;
 
 namespace SabreTools.IO.Test
 {
-    public class BufferedStreamTests
+    public class BufferedStreamReaderTests
     {
         #region ReadNextByte
 
@@ -11,7 +11,7 @@ namespace SabreTools.IO.Test
         public void ReadNextByte_Empty_Null()
         {
             var source = new MemoryStream();
-            var stream = new BufferedStream(source);
+            var stream = new BufferedStreamReader(source);
             byte? actual = stream.ReadNextByte();
             Assert.Null(actual);
         }
@@ -20,7 +20,7 @@ namespace SabreTools.IO.Test
         public void ReadNextByte_Filled_ValidPosition_Byte()
         {
             var source = new MemoryStream(new byte[1024]);
-            var stream = new BufferedStream(source);
+            var stream = new BufferedStreamReader(source);
             byte? actual = stream.ReadNextByte();
             Assert.Equal((byte)0x00, actual);
         }
@@ -30,7 +30,7 @@ namespace SabreTools.IO.Test
         {
             var source = new MemoryStream(new byte[1024]);
             source.Seek(0, SeekOrigin.End);
-            var stream = new BufferedStream(source);
+            var stream = new BufferedStreamReader(source);
             byte? actual = stream.ReadNextByte();
             Assert.Null(actual);
         }
diff --git a/SabreTools.IO/BufferedStream.cs b/SabreTools.IO/BufferedStreamReader.cs
similarity index 90%
rename from SabreTools.IO/BufferedStream.cs
rename to SabreTools.IO/BufferedStreamReader.cs
index fc7b098..11e14d7 100644
--- a/SabreTools.IO/BufferedStream.cs
+++ b/SabreTools.IO/BufferedStreamReader.cs
@@ -3,10 +3,9 @@ using System.IO;
 namespace SabreTools.IO
 {
     /// <summary>
-    /// Buffered stream that reads in blocks
+    /// Buffered stream reader that reads in blocks
     /// </summary>
-    /// <remarks>Not a true <see cref="Stream"/> implementation yet</remarks>
-    public class BufferedStream
+    public class BufferedStreamReader
     {
         /// <summary>
         /// Source stream for populating the buffer
@@ -31,7 +30,7 @@ namespace SabreTools.IO
         /// <summary>
         /// Create a new buffered stream
         /// </summary>
-        public BufferedStream(Stream source)
+        public BufferedStreamReader(Stream source)
         {
             _source = source;
         }
diff --git a/SabreTools.IO/README.MD b/SabreTools.IO/README.MD
index f273d85..6194ad1 100644
--- a/SabreTools.IO/README.MD
+++ b/SabreTools.IO/README.MD
@@ -8,7 +8,6 @@ This library contains both custom stream implementations and utility classes for
 
 | Class | Notes |
 | --- | --- |
-| `BufferedStream` | Not a true stream implementation used for buffered, single-byte reads |
 | `ReadOnlyBitStream` | Read-only stream implementation allowing bitwise reading |
 | `ReadOnlyCompositeStream` | Read-only stream implementation that wraps multiple source streams in a set order |
 | `ReadOnlyViewStream` | Read-only stream implementation representing a view into source data |
@@ -17,5 +16,6 @@ This library contains both custom stream implementations and utility classes for
 
 | Class | Notes |
 | --- | --- |
+| `BufferedStreamReader` | Stream reader used for buffered, single-byte reads |
 | `ParentablePath` | Class that represents a path that is rooted by a parent directory |
 | `PathTool` | Utility class for common Path-related functions |