diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt b/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt
index 3eda1eb2237..8c2cb2a4372 100644
--- a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt
+++ b/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt
@@ -55,7 +55,7 @@ class KDocConfig() {
      */
     fun resolveLink(packageName: String): String {
         // TODO should be able to do something like
-        // for (e in packageUrls.filterNulls()) {
+        // for (e in packageUrls.filterNotNull()) {
         val entrySet = packagePrefixToUrls.entrySet()
         if (entrySet != null) {
             for (e in entrySet) {
diff --git a/libraries/pom.xml b/libraries/pom.xml
index d14371bab5b..32a7d2bd60f 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -39,16 +39,6 @@
         </pluginRepository>
     </pluginRepositories>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-
     <modules>
         <module>stdlib</module>
         <module>kunit</module>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index b2e66f38620..7a60bea9fb3 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -14,6 +14,12 @@
     <artifactId>stdlib</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -27,6 +33,15 @@
             <plugin>
                 <groupId>com.goldin.plugins</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile-kotlin-sources</id>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/libraries/stdlib/src/JavaIterables.kt b/libraries/stdlib/src/JavaIterables.kt
index 14092aad1a2..80fb970453d 100644
--- a/libraries/stdlib/src/JavaIterables.kt
+++ b/libraries/stdlib/src/JavaIterables.kt
@@ -54,10 +54,10 @@ inline fun <T, C: Collection<in T>> java.lang.Iterable<T>.filterTo(result: C, pr
 }
 
 /** Returns a List containing all the non null elements in this collection */
-inline fun <T> java.lang.Iterable<T?>?.filterNulls() : Collection<T> = filterNullsTo(java.util.ArrayList<T>())
+inline fun <T> java.lang.Iterable<T?>?.filterNotNull() : Collection<T> = filterNotNullTo(java.util.ArrayList<T>())
 
 /** Filters all the null elements in this collection winto the given result collection */
-inline fun <T, C: Collection<in T>> java.lang.Iterable<T?>?.filterNullsTo(result: C) : C {
+inline fun <T, C: Collection<in T>> java.lang.Iterable<T?>?.filterNotNullTo(result: C) : C {
     if (this != null) {
         for (elem in this) {
             if (elem != null)
diff --git a/libraries/stdlib/src/generated/ArraysFromJavaIterables.kt b/libraries/stdlib/src/generated/ArraysFromJavaIterables.kt
index 8d5a80aa89d..fff72dc1fb7 100644
--- a/libraries/stdlib/src/generated/ArraysFromJavaIterables.kt
+++ b/libraries/stdlib/src/generated/ArraysFromJavaIterables.kt
@@ -57,10 +57,10 @@ inline fun <T, C: Collection<in T>> Array<T>.filterTo(result: C, predicate: (T)-
 }
 
 /** Returns a List containing all the non null elements in this collection */
-inline fun <T> Array<T?>?.filterNulls() : Collection<T> = filterNullsTo(java.util.ArrayList<T>())
+inline fun <T> Array<T?>?.filterNotNull() : Collection<T> = filterNotNullTo(java.util.ArrayList<T>())
 
 /** Filters all the null elements in this collection winto the given result collection */
-inline fun <T, C: Collection<in T>> Array<T?>?.filterNullsTo(result: C) : C {
+inline fun <T, C: Collection<in T>> Array<T?>?.filterNotNullTo(result: C) : C {
     if (this != null) {
         for (elem in this) {
             if (elem != null)
diff --git a/libraries/testlib/test/StringUtilTest.kt b/libraries/testlib/test/StringUtilTest.kt
index 1bb7b7c38f0..9e02e9d30df 100644
--- a/libraries/testlib/test/StringUtilTest.kt
+++ b/libraries/testlib/test/StringUtilTest.kt
@@ -10,7 +10,7 @@ class StringUtilTest() : TestCase() {
 
     fun testToRegex() {
         val re = """foo""".toRegex()
-        val list = re.split("hellofoobar").filterNulls()
+        val list = re.split("hellofoobar").filterNotNull()
         assertEquals(arrayList("hello", "bar"), list)
     }
 }