diff --git a/core/api/kotlinx-io-core.api b/core/api/kotlinx-io-core.api
index 38cb45ff8..3c6532c9e 100644
--- a/core/api/kotlinx-io-core.api
+++ b/core/api/kotlinx-io-core.api
@@ -35,7 +35,7 @@ public final class kotlinx/io/Buffer : kotlinx/io/Sink, kotlinx/io/Source {
 	public fun writeShort (S)V
 }
 
-public final class kotlinx/io/BufferExtJvmKt {
+public final class kotlinx/io/BuffersJvmKt {
 	public static final fun asByteChannel (Lkotlinx/io/Buffer;)Ljava/nio/channels/ByteChannel;
 	public static final fun copyTo (Lkotlinx/io/Buffer;Ljava/io/OutputStream;JJ)V
 	public static synthetic fun copyTo$default (Lkotlinx/io/Buffer;Ljava/io/OutputStream;JJILjava/lang/Object;)V
@@ -47,11 +47,11 @@ public final class kotlinx/io/BufferExtJvmKt {
 	public static final fun write (Lkotlinx/io/Buffer;Ljava/io/InputStream;J)Lkotlinx/io/Buffer;
 }
 
-public final class kotlinx/io/BufferExtKt {
+public final class kotlinx/io/BuffersKt {
 	public static final fun snapshot (Lkotlinx/io/Buffer;)Lkotlinx/io/bytestring/ByteString;
 }
 
-public final class kotlinx/io/ByteStringExtKt {
+public final class kotlinx/io/ByteStringsKt {
 	public static final fun indexOf (Lkotlinx/io/Source;Lkotlinx/io/bytestring/ByteString;J)J
 	public static synthetic fun indexOf$default (Lkotlinx/io/Source;Lkotlinx/io/bytestring/ByteString;JILjava/lang/Object;)J
 	public static final fun readByteString (Lkotlinx/io/Source;)Lkotlinx/io/bytestring/ByteString;
@@ -103,7 +103,7 @@ public abstract interface class kotlinx/io/Sink : kotlinx/io/RawSink {
 	public abstract fun writeShort (S)V
 }
 
-public final class kotlinx/io/SinkExtJvmKt {
+public final class kotlinx/io/SinksJvmKt {
 	public static final fun asByteChannel (Lkotlinx/io/Sink;)Ljava/nio/channels/WritableByteChannel;
 	public static final fun asOutputStream (Lkotlinx/io/Sink;)Ljava/io/OutputStream;
 	public static final fun write (Lkotlinx/io/Sink;Ljava/nio/ByteBuffer;)I
@@ -111,7 +111,7 @@ public final class kotlinx/io/SinkExtJvmKt {
 	public static synthetic fun writeString$default (Lkotlinx/io/Sink;Ljava/lang/String;Ljava/nio/charset/Charset;IIILjava/lang/Object;)V
 }
 
-public final class kotlinx/io/SinkExtKt {
+public final class kotlinx/io/SinksKt {
 	public static final fun writeDecimalLong (Lkotlinx/io/Sink;J)V
 	public static final fun writeHexadecimalUnsignedLong (Lkotlinx/io/Sink;J)V
 	public static final fun writeIntLe (Lkotlinx/io/Sink;I)V
@@ -144,7 +144,7 @@ public abstract interface class kotlinx/io/Source : kotlinx/io/RawSource {
 	public abstract fun transferTo (Lkotlinx/io/RawSink;)J
 }
 
-public final class kotlinx/io/SourceExtJvmKt {
+public final class kotlinx/io/SourcesJvmKt {
 	public static final fun asByteChannel (Lkotlinx/io/Source;)Ljava/nio/channels/ReadableByteChannel;
 	public static final fun asInputStream (Lkotlinx/io/Source;)Ljava/io/InputStream;
 	public static final fun readAtMostTo (Lkotlinx/io/Source;Ljava/nio/ByteBuffer;)I
@@ -152,7 +152,7 @@ public final class kotlinx/io/SourceExtJvmKt {
 	public static final fun readString (Lkotlinx/io/Source;Ljava/nio/charset/Charset;)Ljava/lang/String;
 }
 
-public final class kotlinx/io/SourceExtKt {
+public final class kotlinx/io/SourcesKt {
 	public static final fun indexOf (Lkotlinx/io/Source;BJJ)J
 	public static synthetic fun indexOf$default (Lkotlinx/io/Source;BJJILjava/lang/Object;)J
 	public static final fun readByteArray (Lkotlinx/io/Source;)[B
diff --git a/core/common/src/BufferExt.kt b/core/common/src/Buffers.kt
similarity index 100%
rename from core/common/src/BufferExt.kt
rename to core/common/src/Buffers.kt
diff --git a/core/common/src/ByteStringExt.kt b/core/common/src/ByteStrings.kt
similarity index 100%
rename from core/common/src/ByteStringExt.kt
rename to core/common/src/ByteStrings.kt
diff --git a/core/common/src/SinkExt.kt b/core/common/src/Sinks.kt
similarity index 100%
rename from core/common/src/SinkExt.kt
rename to core/common/src/Sinks.kt
diff --git a/core/common/src/SourceExt.kt b/core/common/src/Sources.kt
similarity index 100%
rename from core/common/src/SourceExt.kt
rename to core/common/src/Sources.kt
diff --git a/core/jvm/src/BufferExtJvm.kt b/core/jvm/src/BuffersJvm.kt
similarity index 100%
rename from core/jvm/src/BufferExtJvm.kt
rename to core/jvm/src/BuffersJvm.kt
diff --git a/core/jvm/src/SinkExtJvm.kt b/core/jvm/src/SinksJvm.kt
similarity index 100%
rename from core/jvm/src/SinkExtJvm.kt
rename to core/jvm/src/SinksJvm.kt
diff --git a/core/jvm/src/SourceExtJvm.kt b/core/jvm/src/SourcesJvm.kt
similarity index 100%
rename from core/jvm/src/SourceExtJvm.kt
rename to core/jvm/src/SourcesJvm.kt