diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensionVisitors.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmExtensionVisitors.kt
similarity index 100%
rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensionVisitors.kt
rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmExtensionVisitors.kt
diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmExtensions.kt
similarity index 98%
rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt
rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmExtensions.kt
index 643042ffe40..fcc930de421 100644
--- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt
+++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmExtensions.kt
@@ -4,6 +4,7 @@
  */
 
 @file:Suppress("unused")
+@file:JvmName("JvmExtensionsKt") // for stability. Probably we should drop Kt ending for easier calls from Java
 
 package kotlinx.metadata.jvm
 
diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmMetadataUtil.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmMetadataUtil.kt
similarity index 100%
rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmMetadataUtil.kt
rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmMetadataUtil.kt
diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmExceptionUtils.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmExceptionUtils.kt
similarity index 100%
rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmExceptionUtils.kt
rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmExceptionUtils.kt
diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmExtensionNodes.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmExtensionNodes.kt
similarity index 100%
rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmExtensionNodes.kt
rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmExtensionNodes.kt
diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmWriteUtils.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmWriteUtils.kt
similarity index 100%
rename from libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/jvmWriteUtils.kt
rename to libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/internal/JvmWriteUtils.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/annotations.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/Annotations.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/annotations.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/Annotations.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/extensions.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/Extensions.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/extensions.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/Extensions.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/nodes.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/Nodes.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/nodes.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/Nodes.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/visitors.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/Visitors.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/visitors.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/Visitors.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readUtils.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/ReadUtils.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readUtils.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/ReadUtils.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readers.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/Readers.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/internal/readers.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/Readers.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writeUtils.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/WriteUtils.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writeUtils.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/WriteUtils.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writers.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/Writers.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/internal/writers.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/Writers.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionNodes.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/ExtensionNodes.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionNodes.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/ExtensionNodes.kt
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionUtils.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/ExtensionUtils.kt
similarity index 100%
rename from libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/extensionUtils.kt
rename to libraries/kotlinx-metadata/src/kotlinx/metadata/internal/extensions/ExtensionUtils.kt