diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57e7cba085..db580b05fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -387,6 +387,18 @@ set(ZIG_STAGE2_SOURCES
     lib/std/Build.zig
     lib/std/Build/Cache.zig
     lib/std/Build/Cache/DepTokenizer.zig
+    lib/std/Io.zig
+    lib/std/Io/Reader.zig
+    lib/std/Io/Writer.zig
+    lib/std/Io/buffered_atomic_file.zig
+    lib/std/Io/buffered_writer.zig
+    lib/std/Io/change_detection_stream.zig
+    lib/std/Io/counting_reader.zig
+    lib/std/Io/counting_writer.zig
+    lib/std/Io/find_byte_writer.zig
+    lib/std/Io/fixed_buffer_stream.zig
+    lib/std/Io/limited_reader.zig
+    lib/std/Io/seekable_stream.zig
     lib/std/Progress.zig
     lib/std/Random.zig
     lib/std/Target.zig
@@ -449,18 +461,6 @@ set(ZIG_STAGE2_SOURCES
     lib/std/hash_map.zig
     lib/std/heap.zig
     lib/std/heap/arena_allocator.zig
-    lib/std/io.zig
-    lib/std/io/Reader.zig
-    lib/std/io/Writer.zig
-    lib/std/io/buffered_atomic_file.zig
-    lib/std/io/buffered_writer.zig
-    lib/std/io/change_detection_stream.zig
-    lib/std/io/counting_reader.zig
-    lib/std/io/counting_writer.zig
-    lib/std/io/find_byte_writer.zig
-    lib/std/io/fixed_buffer_stream.zig
-    lib/std/io/limited_reader.zig
-    lib/std/io/seekable_stream.zig
     lib/std/json.zig
     lib/std/json/stringify.zig
     lib/std/leb128.zig
diff --git a/lib/std/io.zig b/lib/std/Io.zig
similarity index 92%
rename from lib/std/io.zig
rename to lib/std/Io.zig
index 5339318cd1..00ff0cea98 100644
--- a/lib/std/io.zig
+++ b/lib/std/Io.zig
@@ -84,8 +84,8 @@ pub const Limit = enum(usize) {
     }
 };
 
-pub const Reader = @import("io/Reader.zig");
-pub const Writer = @import("io/Writer.zig");
+pub const Reader = @import("Io/Reader.zig");
+pub const Writer = @import("Io/Writer.zig");
 
 /// Deprecated in favor of `Reader`.
 pub fn GenericReader(
@@ -404,53 +404,53 @@ pub fn GenericWriter(
 }
 
 /// Deprecated in favor of `Reader`.
-pub const AnyReader = @import("io/DeprecatedReader.zig");
+pub const AnyReader = @import("Io/DeprecatedReader.zig");
 /// Deprecated in favor of `Writer`.
-pub const AnyWriter = @import("io/DeprecatedWriter.zig");
+pub const AnyWriter = @import("Io/DeprecatedWriter.zig");
 
-pub const SeekableStream = @import("io/seekable_stream.zig").SeekableStream;
+pub const SeekableStream = @import("Io/seekable_stream.zig").SeekableStream;
 
-pub const BufferedWriter = @import("io/buffered_writer.zig").BufferedWriter;
-pub const bufferedWriter = @import("io/buffered_writer.zig").bufferedWriter;
+pub const BufferedWriter = @import("Io/buffered_writer.zig").BufferedWriter;
+pub const bufferedWriter = @import("Io/buffered_writer.zig").bufferedWriter;
 
-pub const BufferedReader = @import("io/buffered_reader.zig").BufferedReader;
-pub const bufferedReader = @import("io/buffered_reader.zig").bufferedReader;
-pub const bufferedReaderSize = @import("io/buffered_reader.zig").bufferedReaderSize;
+pub const BufferedReader = @import("Io/buffered_reader.zig").BufferedReader;
+pub const bufferedReader = @import("Io/buffered_reader.zig").bufferedReader;
+pub const bufferedReaderSize = @import("Io/buffered_reader.zig").bufferedReaderSize;
 
-pub const FixedBufferStream = @import("io/fixed_buffer_stream.zig").FixedBufferStream;
-pub const fixedBufferStream = @import("io/fixed_buffer_stream.zig").fixedBufferStream;
+pub const FixedBufferStream = @import("Io/fixed_buffer_stream.zig").FixedBufferStream;
+pub const fixedBufferStream = @import("Io/fixed_buffer_stream.zig").fixedBufferStream;
 
-pub const CWriter = @import("io/c_writer.zig").CWriter;
-pub const cWriter = @import("io/c_writer.zig").cWriter;
+pub const CWriter = @import("Io/c_writer.zig").CWriter;
+pub const cWriter = @import("Io/c_writer.zig").cWriter;
 
-pub const LimitedReader = @import("io/limited_reader.zig").LimitedReader;
-pub const limitedReader = @import("io/limited_reader.zig").limitedReader;
+pub const LimitedReader = @import("Io/limited_reader.zig").LimitedReader;
+pub const limitedReader = @import("Io/limited_reader.zig").limitedReader;
 
-pub const CountingWriter = @import("io/counting_writer.zig").CountingWriter;
-pub const countingWriter = @import("io/counting_writer.zig").countingWriter;
-pub const CountingReader = @import("io/counting_reader.zig").CountingReader;
-pub const countingReader = @import("io/counting_reader.zig").countingReader;
+pub const CountingWriter = @import("Io/counting_writer.zig").CountingWriter;
+pub const countingWriter = @import("Io/counting_writer.zig").countingWriter;
+pub const CountingReader = @import("Io/counting_reader.zig").CountingReader;
+pub const countingReader = @import("Io/counting_reader.zig").countingReader;
 
-pub const MultiWriter = @import("io/multi_writer.zig").MultiWriter;
-pub const multiWriter = @import("io/multi_writer.zig").multiWriter;
+pub const MultiWriter = @import("Io/multi_writer.zig").MultiWriter;
+pub const multiWriter = @import("Io/multi_writer.zig").multiWriter;
 
-pub const BitReader = @import("io/bit_reader.zig").BitReader;
-pub const bitReader = @import("io/bit_reader.zig").bitReader;
+pub const BitReader = @import("Io/bit_reader.zig").BitReader;
+pub const bitReader = @import("Io/bit_reader.zig").bitReader;
 
-pub const BitWriter = @import("io/bit_writer.zig").BitWriter;
-pub const bitWriter = @import("io/bit_writer.zig").bitWriter;
+pub const BitWriter = @import("Io/bit_writer.zig").BitWriter;
+pub const bitWriter = @import("Io/bit_writer.zig").bitWriter;
 
-pub const ChangeDetectionStream = @import("io/change_detection_stream.zig").ChangeDetectionStream;
-pub const changeDetectionStream = @import("io/change_detection_stream.zig").changeDetectionStream;
+pub const ChangeDetectionStream = @import("Io/change_detection_stream.zig").ChangeDetectionStream;
+pub const changeDetectionStream = @import("Io/change_detection_stream.zig").changeDetectionStream;
 
-pub const FindByteWriter = @import("io/find_byte_writer.zig").FindByteWriter;
-pub const findByteWriter = @import("io/find_byte_writer.zig").findByteWriter;
+pub const FindByteWriter = @import("Io/find_byte_writer.zig").FindByteWriter;
+pub const findByteWriter = @import("Io/find_byte_writer.zig").findByteWriter;
 
-pub const BufferedAtomicFile = @import("io/buffered_atomic_file.zig").BufferedAtomicFile;
+pub const BufferedAtomicFile = @import("Io/buffered_atomic_file.zig").BufferedAtomicFile;
 
-pub const StreamSource = @import("io/stream_source.zig").StreamSource;
+pub const StreamSource = @import("Io/stream_source.zig").StreamSource;
 
-pub const tty = @import("io/tty.zig");
+pub const tty = @import("Io/tty.zig");
 
 /// A Writer that doesn't write to anything.
 pub const null_writer: NullWriter = .{ .context = {} };
@@ -869,16 +869,16 @@ pub fn PollFiles(comptime StreamEnum: type) type {
 test {
     _ = Reader;
     _ = Writer;
-    _ = @import("io/bit_reader.zig");
-    _ = @import("io/bit_writer.zig");
-    _ = @import("io/buffered_atomic_file.zig");
-    _ = @import("io/buffered_reader.zig");
-    _ = @import("io/buffered_writer.zig");
-    _ = @import("io/c_writer.zig");
-    _ = @import("io/counting_writer.zig");
-    _ = @import("io/counting_reader.zig");
-    _ = @import("io/fixed_buffer_stream.zig");
-    _ = @import("io/seekable_stream.zig");
-    _ = @import("io/stream_source.zig");
-    _ = @import("io/test.zig");
+    _ = @import("Io/bit_reader.zig");
+    _ = @import("Io/bit_writer.zig");
+    _ = @import("Io/buffered_atomic_file.zig");
+    _ = @import("Io/buffered_reader.zig");
+    _ = @import("Io/buffered_writer.zig");
+    _ = @import("Io/c_writer.zig");
+    _ = @import("Io/counting_writer.zig");
+    _ = @import("Io/counting_reader.zig");
+    _ = @import("Io/fixed_buffer_stream.zig");
+    _ = @import("Io/seekable_stream.zig");
+    _ = @import("Io/stream_source.zig");
+    _ = @import("Io/test.zig");
 }
diff --git a/lib/std/io/DeprecatedReader.zig b/lib/std/Io/DeprecatedReader.zig
similarity index 100%
rename from lib/std/io/DeprecatedReader.zig
rename to lib/std/Io/DeprecatedReader.zig
diff --git a/lib/std/io/DeprecatedWriter.zig b/lib/std/Io/DeprecatedWriter.zig
similarity index 100%
rename from lib/std/io/DeprecatedWriter.zig
rename to lib/std/Io/DeprecatedWriter.zig
diff --git a/lib/std/io/Reader.zig b/lib/std/Io/Reader.zig
similarity index 100%
rename from lib/std/io/Reader.zig
rename to lib/std/Io/Reader.zig
diff --git a/lib/std/io/Reader/Limited.zig b/lib/std/Io/Reader/Limited.zig
similarity index 100%
rename from lib/std/io/Reader/Limited.zig
rename to lib/std/Io/Reader/Limited.zig
diff --git a/lib/std/io/Reader/test.zig b/lib/std/Io/Reader/test.zig
similarity index 100%
rename from lib/std/io/Reader/test.zig
rename to lib/std/Io/Reader/test.zig
diff --git a/lib/std/io/Writer.zig b/lib/std/Io/Writer.zig
similarity index 100%
rename from lib/std/io/Writer.zig
rename to lib/std/Io/Writer.zig
diff --git a/lib/std/io/bit_reader.zig b/lib/std/Io/bit_reader.zig
similarity index 100%
rename from lib/std/io/bit_reader.zig
rename to lib/std/Io/bit_reader.zig
diff --git a/lib/std/io/bit_writer.zig b/lib/std/Io/bit_writer.zig
similarity index 100%
rename from lib/std/io/bit_writer.zig
rename to lib/std/Io/bit_writer.zig
diff --git a/lib/std/io/buffered_atomic_file.zig b/lib/std/Io/buffered_atomic_file.zig
similarity index 100%
rename from lib/std/io/buffered_atomic_file.zig
rename to lib/std/Io/buffered_atomic_file.zig
diff --git a/lib/std/io/buffered_reader.zig b/lib/std/Io/buffered_reader.zig
similarity index 100%
rename from lib/std/io/buffered_reader.zig
rename to lib/std/Io/buffered_reader.zig
diff --git a/lib/std/io/buffered_writer.zig b/lib/std/Io/buffered_writer.zig
similarity index 100%
rename from lib/std/io/buffered_writer.zig
rename to lib/std/Io/buffered_writer.zig
diff --git a/lib/std/io/c_writer.zig b/lib/std/Io/c_writer.zig
similarity index 100%
rename from lib/std/io/c_writer.zig
rename to lib/std/Io/c_writer.zig
diff --git a/lib/std/io/change_detection_stream.zig b/lib/std/Io/change_detection_stream.zig
similarity index 100%
rename from lib/std/io/change_detection_stream.zig
rename to lib/std/Io/change_detection_stream.zig
diff --git a/lib/std/io/counting_reader.zig b/lib/std/Io/counting_reader.zig
similarity index 100%
rename from lib/std/io/counting_reader.zig
rename to lib/std/Io/counting_reader.zig
diff --git a/lib/std/io/counting_writer.zig b/lib/std/Io/counting_writer.zig
similarity index 100%
rename from lib/std/io/counting_writer.zig
rename to lib/std/Io/counting_writer.zig
diff --git a/lib/std/io/find_byte_writer.zig b/lib/std/Io/find_byte_writer.zig
similarity index 100%
rename from lib/std/io/find_byte_writer.zig
rename to lib/std/Io/find_byte_writer.zig
diff --git a/lib/std/io/fixed_buffer_stream.zig b/lib/std/Io/fixed_buffer_stream.zig
similarity index 100%
rename from lib/std/io/fixed_buffer_stream.zig
rename to lib/std/Io/fixed_buffer_stream.zig
diff --git a/lib/std/io/limited_reader.zig b/lib/std/Io/limited_reader.zig
similarity index 100%
rename from lib/std/io/limited_reader.zig
rename to lib/std/Io/limited_reader.zig
diff --git a/lib/std/io/multi_writer.zig b/lib/std/Io/multi_writer.zig
similarity index 100%
rename from lib/std/io/multi_writer.zig
rename to lib/std/Io/multi_writer.zig
diff --git a/lib/std/io/seekable_stream.zig b/lib/std/Io/seekable_stream.zig
similarity index 100%
rename from lib/std/io/seekable_stream.zig
rename to lib/std/Io/seekable_stream.zig
diff --git a/lib/std/io/stream_source.zig b/lib/std/Io/stream_source.zig
similarity index 100%
rename from lib/std/io/stream_source.zig
rename to lib/std/Io/stream_source.zig
diff --git a/lib/std/io/test.zig b/lib/std/Io/test.zig
similarity index 100%
rename from lib/std/io/test.zig
rename to lib/std/Io/test.zig
diff --git a/lib/std/io/tty.zig b/lib/std/Io/tty.zig
similarity index 100%
rename from lib/std/io/tty.zig
rename to lib/std/Io/tty.zig
diff --git a/lib/std/fs/path.zig b/lib/std/fs/path.zig
index 1cf4dc3c64..542166b78e 100644
--- a/lib/std/fs/path.zig
+++ b/lib/std/fs/path.zig
@@ -227,8 +227,8 @@ test join {
         try testJoinMaybeZWindows(&[_][]const u8{ "c:\\a\\", "b\\", "c" }, "c:\\a\\b\\c", zero);
 
         try testJoinMaybeZWindows(
-            &[_][]const u8{ "c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std", "io.zig" },
-            "c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std\\io.zig",
+            &[_][]const u8{ "c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std", "ab.zig" },
+            "c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std\\ab.zig",
             zero,
         );
 
@@ -252,8 +252,8 @@ test join {
         try testJoinMaybeZPosix(&[_][]const u8{ "/a/", "b/", "c" }, "/a/b/c", zero);
 
         try testJoinMaybeZPosix(
-            &[_][]const u8{ "/home/andy/dev/zig/build/lib/zig/std", "io.zig" },
-            "/home/andy/dev/zig/build/lib/zig/std/io.zig",
+            &[_][]const u8{ "/home/andy/dev/zig/build/lib/zig/std", "ab.zig" },
+            "/home/andy/dev/zig/build/lib/zig/std/ab.zig",
             zero,
         );
 
diff --git a/lib/std/std.zig b/lib/std/std.zig
index 5f13b931d1..564b04c609 100644
--- a/lib/std/std.zig
+++ b/lib/std/std.zig
@@ -25,6 +25,7 @@ pub const EnumMap = enums.EnumMap;
 pub const EnumSet = enums.EnumSet;
 pub const HashMap = hash_map.HashMap;
 pub const HashMapUnmanaged = hash_map.HashMapUnmanaged;
+pub const Io = @import("Io.zig");
 pub const MultiArrayList = @import("multi_array_list.zig").MultiArrayList;
 pub const PriorityQueue = @import("priority_queue.zig").PriorityQueue;
 pub const PriorityDequeue = @import("priority_dequeue.zig").PriorityDequeue;
@@ -67,7 +68,8 @@ pub const hash = @import("hash.zig");
 pub const hash_map = @import("hash_map.zig");
 pub const heap = @import("heap.zig");
 pub const http = @import("http.zig");
-pub const io = @import("io.zig");
+/// Deprecated
+pub const io = Io;
 pub const json = @import("json.zig");
 pub const leb = @import("leb128.zig");
 pub const log = @import("log.zig");