diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java
index 0a3ffd129014..44f0132acbb5 100644
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java
@@ -22,10 +22,7 @@ package com.intellij.openapi.projectRoots.impl;
 
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.ProjectBundle;
-import com.intellij.openapi.projectRoots.JavaSdk;
-import com.intellij.openapi.projectRoots.ProjectJdkTable;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.projectRoots.SdkType;
+import com.intellij.openapi.projectRoots.*;
 import com.intellij.util.SystemProperties;
 import org.jdom.Element;
 
@@ -67,7 +64,7 @@ public class JavaAwareProjectJdkTableImpl extends ProjectJdkTableImpl {
   }
 
   @Override
-  public SdkType getDefaultSdkType() {
+  public SdkTypeId getDefaultSdkType() {
     return myJavaSdk;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java
index 876484fa60bc..18e093676725 100644
--- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ public class ProjectJdkImpl extends UserDataHolderBase implements JDOMExternaliz
   @NotNull
   public SdkType getSdkType() {
     if (mySdkType == null) {
-      mySdkType = ProjectJdkTable.getInstance().getDefaultSdkType();
+      mySdkType = (SdkType)ProjectJdkTable.getInstance().getDefaultSdkType();
     }
     return mySdkType;
   }
diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java
index 7265c404e5c2..b9e76f1ee391 100644
--- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java
@@ -22,10 +22,7 @@ import com.intellij.openapi.components.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.project.ProjectBundle;
-import com.intellij.openapi.projectRoots.JavaSdkType;
-import com.intellij.openapi.projectRoots.ProjectJdkTable;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.projectRoots.SdkType;
+import com.intellij.openapi.projectRoots.*;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.InvalidDataException;
@@ -156,7 +153,7 @@ public class ProjectJdkTableImpl extends ProjectJdkTable implements PersistentSt
     return mySdks.toArray(new Sdk[mySdks.size()]);
   }
 
-  public List<Sdk> getSdksOfType(final SdkType type) {
+  public List<Sdk> getSdksOfType(final SdkTypeId type) {
     List<Sdk> result = new ArrayList<Sdk>();
     final Sdk[] sdks = getAllJdks();
     for(Sdk sdk: sdks) {
@@ -168,7 +165,7 @@ public class ProjectJdkTableImpl extends ProjectJdkTable implements PersistentSt
   }
 
   @Override
-  public Sdk findMostRecentSdkOfType(final SdkType type) {
+  public Sdk findMostRecentSdkOfType(final SdkTypeId type) {
     return findMostRecentSdk(new Condition<Sdk>() {
       public boolean value(Sdk sdk) {
         return sdk.getSdkType() == type;
@@ -222,12 +219,12 @@ public class ProjectJdkTableImpl extends ProjectJdkTable implements PersistentSt
     myListenerList.remove(listener);
   }
 
-  public SdkType getDefaultSdkType() {
+  public SdkTypeId getDefaultSdkType() {
     return UnknownSdkType.getInstance(null);
   }
 
-  public Sdk createSdk(final String name, final SdkType sdkType) {
-    return new ProjectJdkImpl(name, sdkType);
+  public Sdk createSdk(final String name, final SdkTypeId sdkType) {
+    return new ProjectJdkImpl(name, (SdkType) sdkType);
   }
 
   public void loadState(Element element) {
diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ProjectJdkTable.java b/platform/projectModel-api/src/com/intellij/openapi/projectRoots/ProjectJdkTable.java
similarity index 90%
rename from platform/lang-api/src/com/intellij/openapi/projectRoots/ProjectJdkTable.java
rename to platform/projectModel-api/src/com/intellij/openapi/projectRoots/ProjectJdkTable.java
index 7bae140c4427..93587c9e380f 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ProjectJdkTable.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/projectRoots/ProjectJdkTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,10 +36,10 @@ public abstract class ProjectJdkTable {
 
   public abstract Sdk[] getAllJdks();
 
-  public abstract List<Sdk> getSdksOfType(SdkType type);
+  public abstract List<Sdk> getSdksOfType(SdkTypeId type);
 
   @Nullable
-  public abstract Sdk findMostRecentSdkOfType(SdkType type);
+  public abstract Sdk findMostRecentSdkOfType(SdkTypeId type);
 
   @Nullable
   public abstract Sdk findMostRecentSdk(Condition<Sdk> condition);
@@ -68,9 +68,9 @@ public abstract class ProjectJdkTable {
    */
   public abstract void removeListener(Listener listener);
 
-  public abstract SdkType getDefaultSdkType();
+  public abstract SdkTypeId getDefaultSdkType();
 
-  public abstract Sdk createSdk(final String name, final SdkType sdkType);
+  public abstract Sdk createSdk(final String name, final SdkTypeId sdkType);
 
   public static Topic<Listener> JDK_TABLE_TOPIC = Topic.create("Project JDK table", Listener.class);
 }