diff --git a/lib/std/compress/flate/Compress.zig b/lib/std/compress/flate/Compress.zig
index 34dff1124c..417cfdef75 100644
--- a/lib/std/compress/flate/Compress.zig
+++ b/lib/std/compress/flate/Compress.zig
@@ -769,7 +769,7 @@ fn read(
     context: ?*anyopaque,
     bw: *std.io.BufferedWriter,
     limit: std.io.Limit,
-) std.io.Reader.RwError!usize {
+) std.io.Reader.StreamError!usize {
     const c: *Compress = @ptrCast(@alignCast(context));
     switch (c.state) {
         .header => |i| {
diff --git a/lib/std/compress/flate/Decompress.zig b/lib/std/compress/flate/Decompress.zig
index b6d2839353..27a80e425c 100644
--- a/lib/std/compress/flate/Decompress.zig
+++ b/lib/std/compress/flate/Decompress.zig
@@ -143,7 +143,7 @@ pub fn read(
     context: ?*anyopaque,
     bw: *std.io.BufferedWriter,
     limit: std.io.Limit,
-) std.io.Reader.RwError!usize {
+) std.io.Reader.StreamError!usize {
     const d: *Decompress = @alignCast(@ptrCast(context));
     return readInner(d, bw, limit) catch |err| switch (err) {
         error.EndOfStream => return error.EndOfStream,
diff --git a/lib/std/compress/lzma2.zig b/lib/std/compress/lzma2.zig
index a6ee94a8da..e71ce93172 100644
--- a/lib/std/compress/lzma2.zig
+++ b/lib/std/compress/lzma2.zig
@@ -2,7 +2,7 @@ const std = @import("../std.zig");
 const Allocator = std.mem.Allocator;
 const lzma = std.compress.lzma;
 
-pub fn decompress(gpa: Allocator, reader: *std.io.BufferedReader, writer: *std.io.BufferedWriter) std.io.Reader.RwError!void {
+pub fn decompress(gpa: Allocator, reader: *std.io.BufferedReader, writer: *std.io.BufferedWriter) std.io.Reader.StreamError!void {
     var decoder = try Decode.init(gpa);
     defer decoder.deinit(gpa);
     return decoder.decompress(gpa, reader, writer);
diff --git a/lib/std/compress/zstd/Decompress.zig b/lib/std/compress/zstd/Decompress.zig
index 7ade4dccdf..8cead1ee62 100644
--- a/lib/std/compress/zstd/Decompress.zig
+++ b/lib/std/compress/zstd/Decompress.zig
@@ -78,7 +78,7 @@ pub fn reader(self: *Decompress) Reader {
     };
 }
 
-fn read(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.RwError!usize {
+fn read(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.StreamError!usize {
     const d: *Decompress = @ptrCast(@alignCast(context));
     const in = d.input;
 
diff --git a/lib/std/crypto/tls/Client.zig b/lib/std/crypto/tls/Client.zig
index cea771bc65..9e6d696400 100644
--- a/lib/std/crypto/tls/Client.zig
+++ b/lib/std/crypto/tls/Client.zig
@@ -1043,7 +1043,7 @@ pub fn eof(c: Client) bool {
     return c.received_close_notify;
 }
 
-fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) Reader.RwError!usize {
+fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) Reader.StreamError!usize {
     const c: *Client = @ptrCast(@alignCast(context));
     if (c.eof()) return error.EndOfStream;
     const input = c.input;
diff --git a/lib/std/http.zig b/lib/std/http.zig
index 0187ba791f..05059adaae 100644
--- a/lib/std/http.zig
+++ b/lib/std/http.zig
@@ -508,7 +508,7 @@ pub const Reader = struct {
         ctx: ?*anyopaque,
         bw: *std.io.BufferedWriter,
         limit: std.io.Limit,
-    ) std.io.Reader.RwError!usize {
+    ) std.io.Reader.StreamError!usize {
         const reader: *Reader = @alignCast(@ptrCast(ctx));
         const remaining_content_length = &reader.state.body_remaining_content_length;
         const remaining = remaining_content_length.*;
@@ -551,7 +551,7 @@ pub const Reader = struct {
         ctx: ?*anyopaque,
         bw: *std.io.BufferedWriter,
         limit: std.io.Limit,
-    ) std.io.Reader.RwError!usize {
+    ) std.io.Reader.StreamError!usize {
         const reader: *Reader = @alignCast(@ptrCast(ctx));
         const chunk_len_ptr = switch (reader.state) {
             .ready => return error.EndOfStream,
@@ -577,7 +577,7 @@ pub const Reader = struct {
         bw: *std.io.BufferedWriter,
         limit: std.io.Limit,
         chunk_len_ptr: *RemainingChunkLen,
-    ) (BodyError || std.io.Reader.RwError)!usize {
+    ) (BodyError || std.io.Reader.StreamError)!usize {
         const in = reader.in;
         len: switch (chunk_len_ptr.*) {
             .head => {
diff --git a/lib/std/io/BufferedReader.zig b/lib/std/io/BufferedReader.zig
index 8d43901004..e4a41e1670 100644
--- a/lib/std/io/BufferedReader.zig
+++ b/lib/std/io/BufferedReader.zig
@@ -104,7 +104,7 @@ pub fn readAll(br: *BufferedReader, bw: *BufferedWriter, limit: Limit) Reader.St
 /// a success case.
 ///
 /// Returns total number of bytes written to `bw`.
-pub fn readRemaining(br: *BufferedReader, bw: *BufferedWriter) Reader.RwRemainingError!usize {
+pub fn readRemaining(br: *BufferedReader, bw: *BufferedWriter) Reader.StreamRemainingError!usize {
     var offset: usize = 0;
     while (true) {
         offset += br.read(bw, .unlimited) catch |err| switch (err) {
@@ -720,7 +720,7 @@ pub fn readDelimiterEnding(
     br: *BufferedReader,
     bw: *BufferedWriter,
     delimiter: u8,
-) Reader.RwRemainingError!usize {
+) Reader.StreamRemainingError!usize {
     const amount, const to = try br.readAny(bw, delimiter, .unlimited);
     return switch (to) {
         .delimiter, .end => amount,
@@ -728,7 +728,7 @@ pub fn readDelimiterEnding(
     };
 }
 
-pub const StreamDelimiterLimitedError = Reader.RwRemainingError || error{
+pub const StreamDelimiterLimitedError = Reader.StreamRemainingError || error{
     /// Stream ended before the delimiter was found.
     EndOfStream,
     /// The delimiter was not found within the limit.
@@ -758,7 +758,7 @@ fn readAny(
     bw: *BufferedWriter,
     delimiter: ?u8,
     limit: Limit,
-) Reader.RwRemainingError!struct { usize, enum { delimiter, limit, end } } {
+) Reader.StreamRemainingError!struct { usize, enum { delimiter, limit, end } } {
     var amount: usize = 0;
     var remaining = limit;
     while (remaining.nonzero()) {
diff --git a/lib/std/io/Reader.zig b/lib/std/io/Reader.zig
index 121ab872c2..f8b5215d28 100644
--- a/lib/std/io/Reader.zig
+++ b/lib/std/io/Reader.zig
@@ -46,7 +46,7 @@ pub const VTable = struct {
     /// provided which is based on calling `read`, borrowing
     /// `BufferedReader.buffer` to construct a temporary `BufferedWriter` and
     /// ignoring the written data.
-    discard: *const fn (context: ?*anyopaque, limit: Limit) DiscardError!usize = null,
+    discard: *const fn (context: ?*anyopaque, limit: Limit) Error!usize = null,
 };
 
 pub const StreamError = error{
@@ -59,13 +59,13 @@ pub const StreamError = error{
     EndOfStream,
 };
 
-pub const DiscardError = error{
+pub const Error = error{
     /// See the `Reader` implementation for detailed diagnostics.
     ReadFailed,
     EndOfStream,
 };
 
-pub const RwRemainingError = error{
+pub const StreamRemainingError = error{
     /// See the `Reader` implementation for detailed diagnostics.
     ReadFailed,
     /// See the `Writer` implementation for detailed diagnostics.
@@ -85,14 +85,14 @@ pub fn read(r: Reader, bw: *BufferedWriter, limit: Limit) StreamError!usize {
     return n;
 }
 
-pub fn discard(r: Reader, limit: Limit) DiscardError!usize {
+pub fn discard(r: Reader, limit: Limit) Error!usize {
     const n = try r.vtable.discard(r.context, limit);
     assert(n <= @intFromEnum(limit));
     return n;
 }
 
 /// Returns total number of bytes written to `bw`.
-pub fn readRemaining(r: Reader, bw: *BufferedWriter) RwRemainingError!usize {
+pub fn readRemaining(r: Reader, bw: *BufferedWriter) StreamRemainingError!usize {
     const readFn = r.vtable.read;
     var offset: usize = 0;
     while (true) {
@@ -212,7 +212,7 @@ fn endingRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) StreamErr
     return error.EndOfStream;
 }
 
-fn endingDiscard(context: ?*anyopaque, limit: Limit) DiscardError!usize {
+fn endingDiscard(context: ?*anyopaque, limit: Limit) Error!usize {
     _ = context;
     _ = limit;
     return error.EndOfStream;
@@ -225,7 +225,7 @@ fn failingRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) StreamEr
     return error.ReadFailed;
 }
 
-fn failingDiscard(context: ?*anyopaque, limit: Limit) DiscardError!usize {
+fn failingDiscard(context: ?*anyopaque, limit: Limit) Error!usize {
     _ = context;
     _ = limit;
     return error.ReadFailed;
@@ -297,7 +297,7 @@ pub fn Hashed(comptime Hasher: type) type {
             return n;
         }
 
-        fn discard(context: ?*anyopaque, limit: Limit) DiscardError!usize {
+        fn discard(context: ?*anyopaque, limit: Limit) Error!usize {
             const this: *@This() = @alignCast(@ptrCast(context));
             var bw = this.hasher.writable(&.{});
             const n = this.in.read(&bw, limit) catch |err| switch (err) {
@@ -307,7 +307,7 @@ pub fn Hashed(comptime Hasher: type) type {
             return n;
         }
 
-        fn readVec(context: ?*anyopaque, data: []const []u8) DiscardError!usize {
+        fn readVec(context: ?*anyopaque, data: []const []u8) Error!usize {
             const this: *@This() = @alignCast(@ptrCast(context));
             const n = try this.in.readVec(data);
             var remaining: usize = n;
diff --git a/lib/std/io/Reader/Limited.zig b/lib/std/io/Reader/Limited.zig
index cb9c1622b6..257bf88348 100644
--- a/lib/std/io/Reader/Limited.zig
+++ b/lib/std/io/Reader/Limited.zig
@@ -19,7 +19,7 @@ pub fn reader(l: *Limited) Reader {
     };
 }
 
-fn passthruRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.RwError!usize {
+fn passthruRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.StreamError!usize {
     const l: *Limited = @alignCast(@ptrCast(context));
     const combined_limit = limit.min(l.remaining);
     const n = try l.unlimited_reader.read(bw, combined_limit);
diff --git a/lib/std/tar.zig b/lib/std/tar.zig
index 100c120ff8..37d51c04fc 100644
--- a/lib/std/tar.zig
+++ b/lib/std/tar.zig
@@ -358,7 +358,7 @@ pub const Iterator = struct {
             };
         }
 
-        fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) std.io.Reader.RwError!usize {
+        fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) std.io.Reader.StreamError!usize {
             const file: *File = @ptrCast(@alignCast(context));
             if (file.unread_bytes.* == 0) return error.EndOfStream;
             const n = try file.parent_reader.read(bw, limit.min(.limited(file.unread_bytes.*)));
@@ -381,7 +381,7 @@ pub const Iterator = struct {
             return n;
         }
 
-        pub fn readRemaining(file: *File, out: *std.io.BufferedWriter) std.io.Reader.RwRemainingError!void {
+        pub fn readRemaining(file: *File, out: *std.io.BufferedWriter) std.io.Reader.StreamRemainingError!void {
             return file.reader().readRemaining(out);
         }
     };
diff --git a/lib/std/tar/Writer.zig b/lib/std/tar/Writer.zig
index ec9d3eb4dc..3b9653eef2 100644
--- a/lib/std/tar/Writer.zig
+++ b/lib/std/tar/Writer.zig
@@ -69,7 +69,7 @@ pub fn writeFileStream(
     size: usize,
     reader: *std.io.BufferedReader,
     options: Options,
-) std.io.Reader.RwError!void {
+) std.io.Reader.StreamError!void {
     try w.writeHeader(.regular, sub_path, "", @intCast(size), options);
     try reader.readAll(w.underlying_writer, .limited(size));
     try w.writePadding(size);
diff --git a/lib/std/zip.zig b/lib/std/zip.zig
index 8976e030bb..d71927675c 100644
--- a/lib/std/zip.zig
+++ b/lib/std/zip.zig
@@ -202,7 +202,7 @@ pub const Decompress = union {
         context: ?*anyopaque,
         writer: *std.io.BufferedWriter,
         limit: std.io.Limit,
-    ) std.io.Reader.RwError!usize {
+    ) std.io.Reader.StreamError!usize {
         const d: *Decompress = @ptrCast(@alignCast(context));
         return d.store.read(writer, limit);
     }
@@ -211,7 +211,7 @@ pub const Decompress = union {
         context: ?*anyopaque,
         writer: *std.io.BufferedWriter,
         limit: std.io.Limit,
-    ) std.io.Reader.RwError!usize {
+    ) std.io.Reader.StreamError!usize {
         const d: *Decompress = @ptrCast(@alignCast(context));
         return std.compress.flate.Decompress.read(&d.inflate, writer, limit);
     }
diff --git a/src/deprecated.zig b/src/deprecated.zig
index 4d95aeade8..8f406a262c 100644
--- a/src/deprecated.zig
+++ b/src/deprecated.zig
@@ -165,40 +165,6 @@ pub fn LinearFifo(comptime T: type) type {
             return self.read(dest);
         }
 
-        pub fn reader(self: *Self) std.io.Reader {
-            return .{
-                .context = self,
-                .vtable = &.{
-                    .read = &readerRead,
-                    .readVec = &readerReadVec,
-                    .discard = &readerDiscard,
-                },
-            };
-        }
-        fn readerRead(
-            ctx: ?*anyopaque,
-            bw: *std.io.BufferedWriter,
-            limit: std.io.Limit,
-        ) std.io.Reader.RwError!usize {
-            const fifo: *Self = @alignCast(@ptrCast(ctx));
-            _ = fifo;
-            _ = bw;
-            _ = limit;
-            @panic("TODO");
-        }
-        fn readerReadVec(ctx: ?*anyopaque, data: []const []u8) std.io.Reader.Error!usize {
-            const fifo: *Self = @alignCast(@ptrCast(ctx));
-            _ = fifo;
-            _ = data;
-            @panic("TODO");
-        }
-        fn readerDiscard(ctx: ?*anyopaque, limit: std.io.Limit) std.io.Reader.Error!usize {
-            const fifo: *Self = @alignCast(@ptrCast(ctx));
-            _ = fifo;
-            _ = limit;
-            @panic("TODO");
-        }
-
         /// Returns number of items available in fifo
         pub fn writableLength(self: Self) usize {
             return self.buf.len - self.count;