diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageRenderer.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageRenderer.java
index 7a20a714a0e..04ad3d623d1 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageRenderer.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageRenderer.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.cli.common.messages;
 
-import kotlin.io.IoPackage;
+import kotlin.io.FilesKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -49,7 +49,7 @@ public interface MessageRenderer {
         @Override
         protected String getPath(@NotNull CompilerMessageLocation location) {
             String path = location.getPath();
-            return cwd == null || path == null ? path : IoPackage.relativePath(cwd, new File(path));
+            return cwd == null || path == null ? path : FilesKt.relativePath(cwd, new File(path));
         }
     };
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
index 92490c5480a..fd44dc51639 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFileSystem;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import kotlin.Unit;
-import kotlin.io.IoPackage;
+import kotlin.io.FilesKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -162,7 +162,7 @@ public class CompileEnvironmentUtil {
                 continue;
             }
 
-            IoPackage.recurse(new File(sourceRootPath), new Function1<File, Unit>() {
+            FilesKt.recurse(new File(sourceRootPath), new Function1<File, Unit>() {
                 @Override
                 public Unit invoke(File file) {
                     if (file.isFile()) {
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java
index 54a1849ec5c..81809edfae2 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java
@@ -22,7 +22,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import kotlin.Charsets;
-import kotlin.io.IoPackage;
+import kotlin.io.FilesKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.CLICompiler;
 import org.jetbrains.kotlin.cli.common.ExitCode;
@@ -104,7 +104,7 @@ public class CliBaseTest {
             @NotNull final String testDataDir,
             @NotNull final String tempDir
     ) throws IOException {
-        List<String> lines = IoPackage.readLines(new File(argsFilePath), Charsets.UTF_8);
+        List<String> lines = FilesKt.readLines(new File(argsFilePath), Charsets.UTF_8);
 
         return ContainerUtil.mapNotNull(lines, new Function<String, String>() {
             @Override
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java
index 2e28ef58c4e..46637c24c37 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
 import kotlin.Charsets;
-import kotlin.io.IoPackage;
+import kotlin.io.FilesKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
@@ -68,7 +68,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
 
     public void doTestWithStdlib(@NotNull String filename) {
         configurationKind = InTextDirectivesUtils.isDirectiveDefined(
-                IoPackage.readText(new File(filename), Charsets.UTF_8), "NO_KOTLIN_REFLECT"
+                FilesKt.readText(new File(filename), Charsets.UTF_8), "NO_KOTLIN_REFLECT"
         ) ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.ALL;
 
         myEnvironment = JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
@@ -108,7 +108,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
         }
 
         return InTextDirectivesUtils.isDirectiveDefined(
-                IoPackage.readText(new File(sourcePath), Charsets.UTF_8), "FULL_JDK"
+                FilesKt.readText(new File(sourcePath), Charsets.UTF_8), "FULL_JDK"
         ) ? TestJdkKind.FULL_JDK : TestJdkKind.MOCK_JDK;
     }
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
index 9403b29609b..507cd7f90a3 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import kotlin.CollectionsKt;
-import kotlin.io.IoPackage;
+import kotlin.io.FilesKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.ModuleChunk;
@@ -123,7 +123,7 @@ public class KotlinBuilderModuleScriptGenerator {
             @Override
             public boolean value(File file) {
                 if (!file.exists()) {
-                    String extension = IoPackage.getExtension(file);
+                    String extension = FilesKt.getExtension(file);
 
                     // Don't filter out files, we want to report warnings about absence through the common place
                     if (!(extension.equals("class") || extension.equals("jar"))) {