Cleanup in libraries

libraries/stdlib/test/collections/MapJVMTest.kt

@@ -43,7 +43,7 @@ class MapJVMTest {
     }
 
     @test fun iterateAndRemove() {
-        val map = (1..5).toMap({ it }, { 'a' + it }).toLinkedMap()
+        val map = (1..5).toMapBy({ it }, { 'a' + it }).toLinkedMap()
         val iterator = map.iterator()
         while (iterator.hasNext()) {
             if (iterator.next().key % 2 == 0)

libraries/stdlib/test/collections/MapTest.kt

@@ -187,7 +187,7 @@ class MapTest {
     }
 
     @test fun createWithSelectorForKeyAndValue() {
-        val map = listOf("a", "bb", "ccc").toMap({ it.length }, { it.toUpperCase() })
+        val map = listOf("a", "bb", "ccc").toMapBy({ it.length }, { it.toUpperCase() })
         assertEquals(3, map.size)
         assertEquals("A", map[1])
         assertEquals("BB", map[2])