diff --git a/libraries/stdlib/src/generated/ArraysFromJavaIterables.kt b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt
similarity index 98%
rename from libraries/stdlib/src/generated/ArraysFromJavaIterables.kt
rename to libraries/stdlib/src/generated/ArraysFromJLangIterables.kt
index 57e3abdaef7..2343caa6fcc 100644
--- a/libraries/stdlib/src/generated/ArraysFromJavaIterables.kt
+++ b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaIterables.kt
+// NOTE this file is auto-generated from src/kotlin/JLangIterables.kt
 package kotlin
 
 import kotlin.util.*
diff --git a/libraries/stdlib/src/generated/ArraysFromJavaIterablesLazy.kt b/libraries/stdlib/src/generated/ArraysFromJLangIterablesLazy.kt
similarity index 97%
rename from libraries/stdlib/src/generated/ArraysFromJavaIterablesLazy.kt
rename to libraries/stdlib/src/generated/ArraysFromJLangIterablesLazy.kt
index 5fddaca0804..4e4d7b2024d 100644
--- a/libraries/stdlib/src/generated/ArraysFromJavaIterablesLazy.kt
+++ b/libraries/stdlib/src/generated/ArraysFromJLangIterablesLazy.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaIterablesLazy.kt
+// NOTE this file is auto-generated from src/kotlin/JLangIterablesLazy.kt
 package kotlin
 
 import kotlin.util.*
diff --git a/libraries/stdlib/src/generated/ArraysFromJavaCollections.kt b/libraries/stdlib/src/generated/ArraysFromJUtilCollections.kt
similarity index 92%
rename from libraries/stdlib/src/generated/ArraysFromJavaCollections.kt
rename to libraries/stdlib/src/generated/ArraysFromJUtilCollections.kt
index f4966338ecf..2ec6befa344 100644
--- a/libraries/stdlib/src/generated/ArraysFromJavaCollections.kt
+++ b/libraries/stdlib/src/generated/ArraysFromJUtilCollections.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaCollections.kt
+// NOTE this file is auto-generated from src/kotlin/JUtilCollections.kt
 package kotlin
 
 import java.util.*
diff --git a/libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt b/libraries/stdlib/src/generated/JUnilIterablesFromJUtilCollections.kt
similarity index 92%
rename from libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt
rename to libraries/stdlib/src/generated/JUnilIterablesFromJUtilCollections.kt
index 4d4561abf2c..6cdb191c32e 100644
--- a/libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt
+++ b/libraries/stdlib/src/generated/JUnilIterablesFromJUtilCollections.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaCollections.kt
+// NOTE this file is auto-generated from src/kotlin/JUtilCollections.kt
 package kotlin
 
 import java.util.*
diff --git a/libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt b/libraries/stdlib/src/generated/JUnilIteratorsFromJLangIterables.kt
similarity index 98%
rename from libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt
rename to libraries/stdlib/src/generated/JUnilIteratorsFromJLangIterables.kt
index 954670f367b..a6d1338e08a 100644
--- a/libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt
+++ b/libraries/stdlib/src/generated/JUnilIteratorsFromJLangIterables.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaIterables.kt
+// NOTE this file is auto-generated from src/kotlin/JLangIterables.kt
 package kotlin
 
 import java.util.*
diff --git a/libraries/stdlib/src/generated/StandardFromJavaIterables.kt b/libraries/stdlib/src/generated/StandardFromJLangIterables.kt
similarity index 98%
rename from libraries/stdlib/src/generated/StandardFromJavaIterables.kt
rename to libraries/stdlib/src/generated/StandardFromJLangIterables.kt
index 647ddc3276a..72224ca65eb 100644
--- a/libraries/stdlib/src/generated/StandardFromJavaIterables.kt
+++ b/libraries/stdlib/src/generated/StandardFromJLangIterables.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaIterables.kt
+// NOTE this file is auto-generated from src/kotlin/JLangIterables.kt
 package kotlin
 
 import kotlin.util.*
diff --git a/libraries/stdlib/src/generated/StandardFromJavaIterablesLazy.kt b/libraries/stdlib/src/generated/StandardFromJLangIterablesLazy.kt
similarity index 97%
rename from libraries/stdlib/src/generated/StandardFromJavaIterablesLazy.kt
rename to libraries/stdlib/src/generated/StandardFromJLangIterablesLazy.kt
index 4fbf52e3d80..4510fa4866c 100644
--- a/libraries/stdlib/src/generated/StandardFromJavaIterablesLazy.kt
+++ b/libraries/stdlib/src/generated/StandardFromJLangIterablesLazy.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaIterablesLazy.kt
+// NOTE this file is auto-generated from src/kotlin/JLangIterablesLazy.kt
 package kotlin
 
 import kotlin.util.*
diff --git a/libraries/stdlib/src/generated/StandardFromJavaCollections.kt b/libraries/stdlib/src/generated/StandardFromJUtilCollections.kt
similarity index 92%
rename from libraries/stdlib/src/generated/StandardFromJavaCollections.kt
rename to libraries/stdlib/src/generated/StandardFromJUtilCollections.kt
index e70eb384c77..9820e5dfd94 100644
--- a/libraries/stdlib/src/generated/StandardFromJavaCollections.kt
+++ b/libraries/stdlib/src/generated/StandardFromJUtilCollections.kt
@@ -1,4 +1,4 @@
-// NOTE this file is auto-generated from src/kotlin/JavaCollections.kt
+// NOTE this file is auto-generated from src/kotlin/JUtilCollections.kt
 package kotlin
 
 import java.util.*
diff --git a/libraries/stdlib/src/kotlin/JavaIterables.kt b/libraries/stdlib/src/kotlin/JLangIterables.kt
similarity index 100%
rename from libraries/stdlib/src/kotlin/JavaIterables.kt
rename to libraries/stdlib/src/kotlin/JLangIterables.kt
diff --git a/libraries/stdlib/src/kotlin/JavaIterablesLazy.kt b/libraries/stdlib/src/kotlin/JLangIterablesLazy.kt
similarity index 100%
rename from libraries/stdlib/src/kotlin/JavaIterablesLazy.kt
rename to libraries/stdlib/src/kotlin/JLangIterablesLazy.kt
diff --git a/libraries/stdlib/src/kotlin/JavaIterablesSpecial.kt b/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt
similarity index 100%
rename from libraries/stdlib/src/kotlin/JavaIterablesSpecial.kt
rename to libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt
diff --git a/libraries/stdlib/src/kotlin/JavaCollections.kt b/libraries/stdlib/src/kotlin/JUtilCollections.kt
similarity index 100%
rename from libraries/stdlib/src/kotlin/JavaCollections.kt
rename to libraries/stdlib/src/kotlin/JUtilCollections.kt
diff --git a/libraries/stdlib/src/kotlin/JUMaps.kt b/libraries/stdlib/src/kotlin/JUtilMaps.kt
similarity index 100%
rename from libraries/stdlib/src/kotlin/JUMaps.kt
rename to libraries/stdlib/src/kotlin/JUtilMaps.kt
diff --git a/libraries/stdlib/test/GenerateStandardLib.kt b/libraries/stdlib/test/GenerateStandardLib.kt
index 89b149a3ad0..bb238bc645f 100644
--- a/libraries/stdlib/test/GenerateStandardLib.kt
+++ b/libraries/stdlib/test/GenerateStandardLib.kt
@@ -48,37 +48,37 @@ fun main(args: Array<String>) {
     }
     val outDir = File(srcDir, "../generated")
 
-    // JavaIterables - Generic iterable stuff
-    generateFile(File(outDir, "ArraysFromJavaIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JavaIterables.kt")) {
+    // JLangIterables - Generic iterable stuff
+    generateFile(File(outDir, "ArraysFromJLangIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterables.kt")) {
         it.replaceAll("java.lang.Iterable<T", "Array<T").replaceAll("java.lang.Iterable<T", "Array<T")
     }
-    generateFile(File(outDir, "ArraysFromJavaIterablesLazy.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JavaIterablesLazy.kt")) {
+    generateFile(File(outDir, "ArraysFromJLangIterablesLazy.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterablesLazy.kt")) {
         it.replaceAll("java.lang.Iterable<T", "Array<T").replaceAll("java.lang.Iterable<T", "Array<T")
     }
 
-    generateFile(File(outDir, "StandardFromJavaIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JavaIterables.kt")) {
+    generateFile(File(outDir, "StandardFromJLangIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterables.kt")) {
         it.replaceAll("java.lang.Iterable<T", "Iterable<T")
     }
-    generateFile(File(outDir, "StandardFromJavaIterablesLazy.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JavaIterablesLazy.kt")) {
+    generateFile(File(outDir, "StandardFromJLangIterablesLazy.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterablesLazy.kt")) {
         it.replaceAll("java.lang.Iterable<T", "Iterable<T")
     }
 
-    generateFile(File(outDir, "JavaUtilIteratorsFromJavaIterables.kt"), "package kotlin", File(srcDir, "JavaIterables.kt")) {
+    generateFile(File(outDir, "JUnilIteratorsFromJLangIterables.kt"), "package kotlin", File(srcDir, "JLangIterables.kt")) {
         it.replaceAll("java.lang.Iterable<T", "java.util.Iterator<T")
     }
 
 
-    // JavaCollections - methods returning a collection of the same input size (if its a collection)
+    // JUtilCollections - methods returning a collection of the same input size (if its a collection)
 
-    generateFile(File(outDir, "ArraysFromJavaCollections.kt"), "package kotlin", File(srcDir, "JavaCollections.kt")) {
+    generateFile(File(outDir, "ArraysFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
         it.replaceAll("java.util.Collection<T", "Array<T")
     }
 
-    generateFile(File(outDir, "JavaUtilIterablesFromJavaCollections.kt"), "package kotlin", File(srcDir, "JavaCollections.kt")) {
+    generateFile(File(outDir, "JUnilIterablesFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
         it.replaceAll("java.util.Collection<T", "java.lang.Iterable<T").replaceAll("(this.size)", "")
     }
 
-    generateFile(File(outDir, "StandardFromJavaCollections.kt"), "package kotlin", File(srcDir, "JavaCollections.kt")) {
+    generateFile(File(outDir, "StandardFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
         it.replaceAll("java.util.Collection<T", "Iterable<T").replaceAll("(this.size)", "")
     }
 }