diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java
index eb7416851b0..337bae52c9c 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java
@@ -59,7 +59,7 @@ public class ProjectStructureUtil {
     public static boolean isJavaKotlinModule(@NotNull Module module) {
         GlobalSearchScope scope = module.getModuleWithDependenciesAndLibrariesScope(
                 hasKotlinFilesOnlyInTests(module));
-        return KotlinRuntimeLibraryCoreUtil.getKotlinRuntimeMarkerClass(scope) != null;
+        return KotlinRuntimeLibraryCoreUtil.getKotlinRuntimeMarkerClass(module.getProject(), scope) != null;
     }
 
     public static boolean isJsKotlinModule(@NotNull final Module module) {
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryCoreUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryCoreUtil.java
index 481a0c71654..78875cca165 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryCoreUtil.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryCoreUtil.java
@@ -17,31 +17,25 @@
 package org.jetbrains.jet.plugin.versions;
 
 import com.google.common.collect.ImmutableList;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
-import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.name.Name;
 
 public class KotlinRuntimeLibraryCoreUtil {
+    private static final ImmutableList<String> CANDIDATE_CLASSES = ImmutableList.of(
+            "kotlin.jvm.internal.Intrinsics",
+
+            // For older versions
+            "jet.runtime.Intrinsics"
+    );
+
     @Nullable
-    public static PsiClass getKotlinRuntimeMarkerClass(@NotNull GlobalSearchScope scope) {
-        FqName kotlinPackageFqName = FqName.topLevel(Name.identifier("kotlin"));
-        String kotlinPackageClassFqName = PackageClassUtils.getPackageClassFqName(kotlinPackageFqName).asString();
-
-        ImmutableList<String> candidateClassNames = ImmutableList.of(
-                kotlinPackageClassFqName,
-                "kotlin.Unit",
-                // For older versions
-                "kotlin.namespace",
-                "jet.Unit"
-        );
-
-        for (String className : candidateClassNames) {
-            PsiClass psiClass = JavaPsiFacade.getInstance(scope.getProject()).findClass(className, scope);
+    public static PsiClass getKotlinRuntimeMarkerClass(@NotNull Project project, @NotNull GlobalSearchScope scope) {
+        for (String className : CANDIDATE_CLASSES) {
+            PsiClass psiClass = JavaPsiFacade.getInstance(project).findClass(className, scope);
             if (psiClass != null) {
                 return psiClass;
             }
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
index 2ece6dbb18d..3cb1deb9776 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
@@ -153,7 +153,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
         }
 
         LibraryScope scope = new LibraryScope(project, library);
-        return KotlinRuntimeLibraryCoreUtil.getKotlinRuntimeMarkerClass(scope) != null;
+        return KotlinRuntimeLibraryCoreUtil.getKotlinRuntimeMarkerClass(project, scope) != null;
     }
 
     KotlinJavaModuleConfigurator() {