diff --git a/libraries/stdlib/src/kotlin/browser/Properties.kt b/libraries/stdlib/src/kotlin/browser/Properties.kt
index 21253f872a0..2ea8a883920 100644
--- a/libraries/stdlib/src/kotlin/browser/Properties.kt
+++ b/libraries/stdlib/src/kotlin/browser/Properties.kt
@@ -1,4 +1,5 @@
 @file:JvmVersion
+@file:JvmName("BrowserKt")
 package kotlin.browser
 
 import org.w3c.dom.Document
diff --git a/libraries/stdlib/src/kotlin/collections/Arrays.kt b/libraries/stdlib/src/kotlin/collections/Arrays.kt
index 61d8fc27b6b..89a83178276 100644
--- a/libraries/stdlib/src/kotlin/collections/Arrays.kt
+++ b/libraries/stdlib/src/kotlin/collections/Arrays.kt
@@ -1,3 +1,7 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("ArraysKt")
+
+
 package kotlin
 
 import java.util.*
diff --git a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt
index cde22984078..d4d245e5242 100644
--- a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt
+++ b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("ArraysKt")
+
 package kotlin
 
 import java.io.ByteArrayInputStream
diff --git a/libraries/stdlib/src/kotlin/collections/Iterators.kt b/libraries/stdlib/src/kotlin/collections/Iterators.kt
index 8ebd96bfc7a..b8e52134784 100644
--- a/libraries/stdlib/src/kotlin/collections/Iterators.kt
+++ b/libraries/stdlib/src/kotlin/collections/Iterators.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("CollectionsKt")
+
 package kotlin
 
 import java.util.Enumeration
diff --git a/libraries/stdlib/src/kotlin/collections/JUtil.kt b/libraries/stdlib/src/kotlin/collections/JUtil.kt
index 0946b53eae1..eb92dacdb9a 100644
--- a/libraries/stdlib/src/kotlin/collections/JUtil.kt
+++ b/libraries/stdlib/src/kotlin/collections/JUtil.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("CollectionsKt")
+
 package kotlin
 
 import java.io.Serializable
diff --git a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
index 3f46505ea5e..85f97fd56a7 100644
--- a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
+++ b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("MapsKt")
+
 package kotlin
 
 import java.util.*
diff --git a/libraries/stdlib/src/kotlin/collections/Maps.kt b/libraries/stdlib/src/kotlin/collections/Maps.kt
index 667dab3e864..658e491203e 100644
--- a/libraries/stdlib/src/kotlin/collections/Maps.kt
+++ b/libraries/stdlib/src/kotlin/collections/Maps.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("MapsKt")
+
 package kotlin
 
 import java.io.Serializable
diff --git a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
index ac279460fbc..6416f865bce 100644
--- a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
+++ b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("MapsKt")
+
 package kotlin
 
 import java.util.Comparator
diff --git a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
index cffc995cfd4..bc48f18b874 100644
--- a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
+++ b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("CollectionsKt")
+
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt
index e5e32ae9279..dfc919acfbc 100644
--- a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt
+++ b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("CollectionsKt")
 
 package kotlin
 
diff --git a/libraries/stdlib/src/kotlin/collections/Sequence.kt b/libraries/stdlib/src/kotlin/collections/Sequence.kt
index c9e96804fb6..0eb03fe0fc3 100644
--- a/libraries/stdlib/src/kotlin/collections/Sequence.kt
+++ b/libraries/stdlib/src/kotlin/collections/Sequence.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("SequencesKt")
+
 package kotlin
 
 import java.util.*
diff --git a/libraries/stdlib/src/kotlin/collections/SequenceJVM.kt b/libraries/stdlib/src/kotlin/collections/SequenceJVM.kt
index 460b3acfbae..0a8690c5dee 100644
--- a/libraries/stdlib/src/kotlin/collections/SequenceJVM.kt
+++ b/libraries/stdlib/src/kotlin/collections/SequenceJVM.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("SequencesKt")
 
 package kotlin
 
diff --git a/libraries/stdlib/src/kotlin/collections/Sets.kt b/libraries/stdlib/src/kotlin/collections/Sets.kt
index 184be93177a..e2fd45529a7 100644
--- a/libraries/stdlib/src/kotlin/collections/Sets.kt
+++ b/libraries/stdlib/src/kotlin/collections/Sets.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("SetsKt")
+
 package kotlin
 
 import java.io.Serializable
diff --git a/libraries/stdlib/src/kotlin/concurrent/Locks.kt b/libraries/stdlib/src/kotlin/concurrent/Locks.kt
index a66fcd877d2..426d92b9bbc 100644
--- a/libraries/stdlib/src/kotlin/concurrent/Locks.kt
+++ b/libraries/stdlib/src/kotlin/concurrent/Locks.kt
@@ -1,4 +1,5 @@
 @file:JvmVersion
+@file:JvmName("LocksKt")
 package kotlin.concurrent
 
 import java.util.concurrent.locks.Lock
diff --git a/libraries/stdlib/src/kotlin/concurrent/Thread.kt b/libraries/stdlib/src/kotlin/concurrent/Thread.kt
index 772338a585c..3520da13e3a 100644
--- a/libraries/stdlib/src/kotlin/concurrent/Thread.kt
+++ b/libraries/stdlib/src/kotlin/concurrent/Thread.kt
@@ -1,4 +1,5 @@
 @file:JvmVersion
+@file:JvmName("ThreadsKt")
 package kotlin.concurrent
 
 import java.util.concurrent.*
diff --git a/libraries/stdlib/src/kotlin/concurrent/Timer.kt b/libraries/stdlib/src/kotlin/concurrent/Timer.kt
index 58b4cf6d30d..cbe9c1ab2e2 100644
--- a/libraries/stdlib/src/kotlin/concurrent/Timer.kt
+++ b/libraries/stdlib/src/kotlin/concurrent/Timer.kt
@@ -1,4 +1,5 @@
 @file:JvmVersion
+@file:JvmName("TimersKt")
 package kotlin.concurrent
 
 import java.util.Date
diff --git a/libraries/stdlib/src/kotlin/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt
index aff1ac05a2e..53ce591a9e9 100644
--- a/libraries/stdlib/src/kotlin/dom/Dom.kt
+++ b/libraries/stdlib/src/kotlin/dom/Dom.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("DomKt")
 package kotlin.dom
 
 import kotlin.support.*
diff --git a/libraries/stdlib/src/kotlin/dom/DomEvents.kt b/libraries/stdlib/src/kotlin/dom/DomEvents.kt
index 1d4d2c4a752..2649931731c 100644
--- a/libraries/stdlib/src/kotlin/dom/DomEvents.kt
+++ b/libraries/stdlib/src/kotlin/dom/DomEvents.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("DomEventsKt")
 package kotlin.dom
 
 import java.io.Closeable
diff --git a/libraries/stdlib/src/kotlin/dom/DomEventsJVM.kt b/libraries/stdlib/src/kotlin/dom/DomEventsJVM.kt
index d141d0dc0d8..b489bfd9fba 100644
--- a/libraries/stdlib/src/kotlin/dom/DomEventsJVM.kt
+++ b/libraries/stdlib/src/kotlin/dom/DomEventsJVM.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("DomEventsKt")
 package kotlin.dom
 
 import org.w3c.dom.events.Event
diff --git a/libraries/stdlib/src/kotlin/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt
index 88395eaaf6c..6dc67a79f8c 100644
--- a/libraries/stdlib/src/kotlin/dom/DomJVM.kt
+++ b/libraries/stdlib/src/kotlin/dom/DomJVM.kt
@@ -1,6 +1,9 @@
+
 /**
  * JVM specific API implementations using JAXP and so forth which would not be used when compiling to JS
  */
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("DomKt")
 package kotlin.dom
 
 import org.w3c.dom.*
diff --git a/libraries/stdlib/src/kotlin/io/Console.kt b/libraries/stdlib/src/kotlin/io/Console.kt
index c0ebf21e347..ef4aa30e2f0 100644
--- a/libraries/stdlib/src/kotlin/io/Console.kt
+++ b/libraries/stdlib/src/kotlin/io/Console.kt
@@ -1,4 +1,5 @@
 @file:JvmVersion
+@file:JvmName("ConsoleKt")
 package kotlin.io
 
 import java.io.InputStream
diff --git a/libraries/stdlib/src/kotlin/io/Constants.kt b/libraries/stdlib/src/kotlin/io/Constants.kt
index d6cad17a046..7905f8f3df8 100644
--- a/libraries/stdlib/src/kotlin/io/Constants.kt
+++ b/libraries/stdlib/src/kotlin/io/Constants.kt
@@ -1,4 +1,6 @@
 @file:JvmVersion
+@file:JvmMultifileClass
+@file:JvmName("FilesKt")
 package kotlin.io
 
 /**
diff --git a/libraries/stdlib/src/kotlin/io/FileReadWrite.kt b/libraries/stdlib/src/kotlin/io/FileReadWrite.kt
index e584f0085c5..3cfc2fc7a6e 100644
--- a/libraries/stdlib/src/kotlin/io/FileReadWrite.kt
+++ b/libraries/stdlib/src/kotlin/io/FileReadWrite.kt
@@ -1,4 +1,6 @@
 @file:JvmVersion
+@file:JvmMultifileClass
+@file:JvmName("FilesKt")
 package kotlin.io
 
 import java.io.*
diff --git a/libraries/stdlib/src/kotlin/io/IOStreams.kt b/libraries/stdlib/src/kotlin/io/IOStreams.kt
index b9f0a586a5c..669fcb1f18f 100644
--- a/libraries/stdlib/src/kotlin/io/IOStreams.kt
+++ b/libraries/stdlib/src/kotlin/io/IOStreams.kt
@@ -1,4 +1,5 @@
 @file:JvmVersion
+@file:JvmName("ByteStreamsKt")
 package kotlin.io
 
 import java.io.*
diff --git a/libraries/stdlib/src/kotlin/io/ReadWrite.kt b/libraries/stdlib/src/kotlin/io/ReadWrite.kt
index 64592def5e9..0972dcb5ef6 100644
--- a/libraries/stdlib/src/kotlin/io/ReadWrite.kt
+++ b/libraries/stdlib/src/kotlin/io/ReadWrite.kt
@@ -1,4 +1,5 @@
 @file:JvmVersion
+@file:JvmName("TextStreamsKt")
 package kotlin.io
 
 import java.io.*
diff --git a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt
index bd5e654bd9e..07b46e8c16b 100644
--- a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt
+++ b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt
@@ -1,4 +1,6 @@
 @file:JvmVersion
+@file:JvmMultifileClass
+@file:JvmName("FilesKt")
 package kotlin.io
 
 import java.io.File
diff --git a/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt b/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt
index 818e4861a27..6c0725e61af 100644
--- a/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt
+++ b/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt
@@ -1,4 +1,6 @@
 @file:JvmVersion
+@file:JvmMultifileClass
+@file:JvmName("FilesKt")
 package kotlin.io
 
 import java.io.File
diff --git a/libraries/stdlib/src/kotlin/io/files/Utils.kt b/libraries/stdlib/src/kotlin/io/files/Utils.kt
index 444a259ff7b..4976ae14390 100644
--- a/libraries/stdlib/src/kotlin/io/files/Utils.kt
+++ b/libraries/stdlib/src/kotlin/io/files/Utils.kt
@@ -1,4 +1,6 @@
 @file:JvmVersion
+@file:JvmMultifileClass
+@file:JvmName("FilesKt")
 package kotlin.io
 
 import java.io.*
diff --git a/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt b/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt
index a6295cb0e76..103024855a7 100644
--- a/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt
+++ b/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:kotlin.jvm.JvmName("ClassMapping")
 
 package kotlin.jvm
 
diff --git a/libraries/stdlib/src/kotlin/math/JMath.kt b/libraries/stdlib/src/kotlin/math/JMath.kt
index acdf7a9e5d0..3a58c011587 100644
--- a/libraries/stdlib/src/kotlin/math/JMath.kt
+++ b/libraries/stdlib/src/kotlin/math/JMath.kt
@@ -1,4 +1,6 @@
 @file:JvmVersion
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("OperationsKt")
 package kotlin.math
 
 import java.math.BigDecimal
diff --git a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt
index 7d30dd77f45..887ce1bba13 100644
--- a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt
+++ b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt
@@ -1,3 +1,4 @@
+@file:kotlin.jvm.JvmName("MapAccessorsKt")
 package kotlin.properties
 
 import java.io.Serializable
diff --git a/libraries/stdlib/src/kotlin/test/Test.kt b/libraries/stdlib/src/kotlin/test/Test.kt
index 26e7d5a90b3..4ed3bdbeefd 100644
--- a/libraries/stdlib/src/kotlin/test/Test.kt
+++ b/libraries/stdlib/src/kotlin/test/Test.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("TestAssertionsKt")
 /**
  * A number of helper methods for writing unit tests.
  */
diff --git a/libraries/stdlib/src/kotlin/test/TestJVM.kt b/libraries/stdlib/src/kotlin/test/TestJVM.kt
index 11af870272b..6957598bfc2 100644
--- a/libraries/stdlib/src/kotlin/test/TestJVM.kt
+++ b/libraries/stdlib/src/kotlin/test/TestJVM.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("TestAssertionsKt")
 package kotlin.test
 
 import java.util.ServiceLoader
diff --git a/libraries/stdlib/src/kotlin/text/Char.kt b/libraries/stdlib/src/kotlin/text/Char.kt
index 2484b15dc88..c9d99ba4bc2 100644
--- a/libraries/stdlib/src/kotlin/text/Char.kt
+++ b/libraries/stdlib/src/kotlin/text/Char.kt
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("CharsKt")
+
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/text/CharJVM.kt b/libraries/stdlib/src/kotlin/text/CharJVM.kt
index bed050ac753..6f2d067fdc5 100644
--- a/libraries/stdlib/src/kotlin/text/CharJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/CharJVM.kt
@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("CharsKt")
+
 
 package kotlin
 
diff --git a/libraries/stdlib/src/kotlin/text/Indent.kt b/libraries/stdlib/src/kotlin/text/Indent.kt
index 578bf86202c..fa87f7f1dfb 100644
--- a/libraries/stdlib/src/kotlin/text/Indent.kt
+++ b/libraries/stdlib/src/kotlin/text/Indent.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StringsKt")
+
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/text/StringBuilder.kt b/libraries/stdlib/src/kotlin/text/StringBuilder.kt
index 5812196903d..021bfa08220 100644
--- a/libraries/stdlib/src/kotlin/text/StringBuilder.kt
+++ b/libraries/stdlib/src/kotlin/text/StringBuilder.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StringsKt")
+
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt b/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt
index 01de9334ffd..fcf07dca83e 100644
--- a/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StringsKt")
+
 package kotlin
 
 /** Line separator for current system. */
diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt
index 40e1d2db6fa..8eed2b07a56 100644
--- a/libraries/stdlib/src/kotlin/text/Strings.kt
+++ b/libraries/stdlib/src/kotlin/text/Strings.kt
@@ -1,3 +1,7 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StringsKt")
+
+
 package kotlin
 
 import java.util.NoSuchElementException
diff --git a/libraries/stdlib/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/src/kotlin/text/StringsJVM.kt
index 0861b3612e7..86b28cf0c4e 100644
--- a/libraries/stdlib/src/kotlin/text/StringsJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/StringsJVM.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StringsKt")
+
 package kotlin
 
 import java.io.StringReader
diff --git a/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt b/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt
index 247fafae66c..0308e87246a 100644
--- a/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt
+++ b/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StringsKt")
+
 package kotlin
 
 import kotlin.text.*
diff --git a/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt b/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt
index 9412cbb4066..382e3675a27 100644
--- a/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt
+++ b/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("PreconditionsKt")
 package kotlin
 
 
diff --git a/libraries/stdlib/src/kotlin/util/Integers.kt b/libraries/stdlib/src/kotlin/util/Integers.kt
index 0a7138cb040..93b803e6b35 100644
--- a/libraries/stdlib/src/kotlin/util/Integers.kt
+++ b/libraries/stdlib/src/kotlin/util/Integers.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StandardKt")
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/util/JLangJVM.kt b/libraries/stdlib/src/kotlin/util/JLangJVM.kt
index 011060518ab..a093304eee0 100644
--- a/libraries/stdlib/src/kotlin/util/JLangJVM.kt
+++ b/libraries/stdlib/src/kotlin/util/JLangJVM.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("ExtensionsKt")
 package kotlin
 
 import java.lang.reflect.Method
diff --git a/libraries/stdlib/src/kotlin/util/Lazy.kt b/libraries/stdlib/src/kotlin/util/Lazy.kt
index 0625334ba2e..bde2c997d82 100644
--- a/libraries/stdlib/src/kotlin/util/Lazy.kt
+++ b/libraries/stdlib/src/kotlin/util/Lazy.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("LazyKt")
+
 package kotlin
 
 import java.io.Serializable
diff --git a/libraries/stdlib/src/kotlin/util/LazyJVM.kt b/libraries/stdlib/src/kotlin/util/LazyJVM.kt
index 3f2a5a50ad1..81395d3119d 100644
--- a/libraries/stdlib/src/kotlin/util/LazyJVM.kt
+++ b/libraries/stdlib/src/kotlin/util/LazyJVM.kt
@@ -1,3 +1,6 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("LazyKt")
+
 package kotlin
 
 
diff --git a/libraries/stdlib/src/kotlin/util/Numbers.kt b/libraries/stdlib/src/kotlin/util/Numbers.kt
index 686d1dca0cd..133a6c891c2 100644
--- a/libraries/stdlib/src/kotlin/util/Numbers.kt
+++ b/libraries/stdlib/src/kotlin/util/Numbers.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("MathKt")
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/util/Ordering.kt b/libraries/stdlib/src/kotlin/util/Ordering.kt
index d78c2ad0a3c..f3a594b6f4e 100644
--- a/libraries/stdlib/src/kotlin/util/Ordering.kt
+++ b/libraries/stdlib/src/kotlin/util/Ordering.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:kotlin.jvm.JvmName("ComparisonsKt")
 
 package kotlin
 
diff --git a/libraries/stdlib/src/kotlin/util/Preconditions.kt b/libraries/stdlib/src/kotlin/util/Preconditions.kt
index 48899c0e932..8e183bc5d6e 100644
--- a/libraries/stdlib/src/kotlin/util/Preconditions.kt
+++ b/libraries/stdlib/src/kotlin/util/Preconditions.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("PreconditionsKt")
 package kotlin
 
 // TODO should not need this - its here for the JS stuff
diff --git a/libraries/stdlib/src/kotlin/util/Ranges.kt b/libraries/stdlib/src/kotlin/util/Ranges.kt
index 22faa6f3148..7eb51e5362c 100644
--- a/libraries/stdlib/src/kotlin/util/Ranges.kt
+++ b/libraries/stdlib/src/kotlin/util/Ranges.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("RangesKt")
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/util/Standard.kt b/libraries/stdlib/src/kotlin/util/Standard.kt
index f8bd255ac69..7e3113787cb 100644
--- a/libraries/stdlib/src/kotlin/util/Standard.kt
+++ b/libraries/stdlib/src/kotlin/util/Standard.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StandardKt")
 package kotlin
 
 /**
diff --git a/libraries/stdlib/src/kotlin/util/StandardJVM.kt b/libraries/stdlib/src/kotlin/util/StandardJVM.kt
index 0b9a8746be4..6f65042bf3b 100644
--- a/libraries/stdlib/src/kotlin/util/StandardJVM.kt
+++ b/libraries/stdlib/src/kotlin/util/StandardJVM.kt
@@ -1,3 +1,5 @@
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("ExceptionsKt")
 package kotlin
 
 import java.io.PrintStream
diff --git a/libraries/stdlib/src/kotlin/util/Synchronized.kt b/libraries/stdlib/src/kotlin/util/Synchronized.kt
index 56723d0289e..4457dc11ddc 100644
--- a/libraries/stdlib/src/kotlin/util/Synchronized.kt
+++ b/libraries/stdlib/src/kotlin/util/Synchronized.kt
@@ -1,4 +1,6 @@
 @file:JvmVersion
+@file:kotlin.jvm.JvmMultifileClass
+@file:kotlin.jvm.JvmName("StandardKt")
 package kotlin
 
 import kotlin.jvm.internal.unsafe.*
diff --git a/libraries/stdlib/src/kotlin/util/SystemJVM.kt b/libraries/stdlib/src/kotlin/util/SystemJVM.kt
index bb5b8909191..3a9f8bb21aa 100644
--- a/libraries/stdlib/src/kotlin/util/SystemJVM.kt
+++ b/libraries/stdlib/src/kotlin/util/SystemJVM.kt
@@ -1,3 +1,4 @@
+@file:kotlin.jvm.JvmName("TimingUtilsKt")
 package kotlin.util
 
 /**
diff --git a/libraries/stdlib/src/kotlin/util/Tuples.kt b/libraries/stdlib/src/kotlin/util/Tuples.kt
index 8945c2cadce..0d271299d83 100644
--- a/libraries/stdlib/src/kotlin/util/Tuples.kt
+++ b/libraries/stdlib/src/kotlin/util/Tuples.kt
@@ -1,3 +1,4 @@
+@file:kotlin.jvm.JvmName("TuplesKt")
 package kotlin
 
 import java.io.Serializable