diff --git a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java
index 83dc967be46b..6e7b6583b5f7 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java
@@ -44,14 +44,10 @@ import org.jetbrains.annotations.Nullable;
  * </ul>
  */
 public interface Configurable extends UnnamedConfigurable {
-  /**
-   * @deprecated projectConfigurable extensions aren't of type Configurable anymore
-   */
-  ExtensionPointName<Configurable> PROJECT_CONFIGURABLES = ExtensionPointName.create("com.intellij.projectConfigurable");
-  /**
-   * @deprecated applicationConfigurable extensions aren't of type Configurable anymore
-   */
-  ExtensionPointName<Configurable> APPLICATION_CONFIGURABLES = ExtensionPointName.create("com.intellij.applicationConfigurable");
+
+  ExtensionPointName<ConfigurableEP> APPLICATION_CONFIGURABLE = ExtensionPointName.create("com.intellij.applicationConfigurable");
+
+  ExtensionPointName<ConfigurableEP> PROJECT_CONFIGURABLE = ExtensionPointName.create("com.intellij.projectConfigurable");
 
   /**
    * Returns the user-visible name of the settings component.
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ConfigurableEP.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/options/ConfigurableEP.java
rename to platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java
index b2a7b96500f5..5c6812fc14c2 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java
@@ -22,11 +22,13 @@ package com.intellij.openapi.options;
  * User: max
  * Date: Dec 9, 2003
  * Time: 3:21:22 PM
- * To change this template use Options | File Templates.
  */
 public interface ConfigurableGroup extends Configurable.Composite {
+
   String getDisplayName();
 
+  /** No one use it */
+  @Deprecated
   String getShortName();
 
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
index b70f12e1089b..5b9a027b65e1 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
@@ -52,7 +52,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
     }
   }
 
-  private static void _showSettingsDialog(final Project project, ConfigurableGroup[] group, Configurable toSelect) {
+  private static void _showSettingsDialog(final Project project, ConfigurableGroup[] group, @Nullable Configurable toSelect) {
     group = filterEmptyGroups(group);
 
     new OptionsEditorDialog(project, group, toSelect).show();
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java
index c733a175f994..38d69ce29d16 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.options.ex;
 
-import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurableEP;
 import com.intellij.openapi.options.ConfigurableProvider;
@@ -33,8 +32,6 @@ import java.util.List;
  * @author nik
  */
 public class ConfigurableExtensionPointUtil {
-  public static final ExtensionPointName<ConfigurableEP> APPLICATION_CONFIGURABLES = ExtensionPointName.create("com.intellij.applicationConfigurable");
-  public static final ExtensionPointName<ConfigurableEP> PROJECT_CONFIGURABLES = ExtensionPointName.create("com.intellij.projectConfigurable");
 
   private ConfigurableExtensionPointUtil() {
   }
@@ -65,12 +62,12 @@ public class ConfigurableExtensionPointUtil {
    */
   @NotNull
   public static <T extends Configurable> T findProjectConfigurable(@NotNull Project project, @NotNull Class<T> configurableClass) {
-    return findConfigurable(project.getExtensions(PROJECT_CONFIGURABLES), configurableClass);
+    return findConfigurable(project.getExtensions(Configurable.PROJECT_CONFIGURABLE), configurableClass);
   }
 
   @NotNull
   public static <T extends Configurable> T findApplicationConfigurable(@NotNull Class<T> configurableClass) {
-    return findConfigurable(APPLICATION_CONFIGURABLES.getExtensions(), configurableClass);
+    return findConfigurable(Configurable.APPLICATION_CONFIGURABLE.getExtensions(), configurableClass);
   }
 
   @NotNull
@@ -88,12 +85,12 @@ public class ConfigurableExtensionPointUtil {
 
   @Nullable
   public static Configurable createProjectConfigurableForProvider(@NotNull Project project, Class<? extends ConfigurableProvider> providerClass) {
-    return createConfigurableForProvider(project.getExtensions(PROJECT_CONFIGURABLES), providerClass);
+    return createConfigurableForProvider(project.getExtensions(Configurable.PROJECT_CONFIGURABLE), providerClass);
   }
 
   @Nullable
   public static Configurable createApplicationConfigurableForProvider(Class<? extends ConfigurableProvider> providerClass) {
-    return createConfigurableForProvider(APPLICATION_CONFIGURABLES.getExtensions(), providerClass);
+    return createConfigurableForProvider(Configurable.APPLICATION_CONFIGURABLE.getExtensions(), providerClass);
   }
 
   @Nullable
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java
index c12db83a0d16..a227449d7a38 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java
@@ -16,6 +16,7 @@
 package com.intellij.openapi.options.ex;
 
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurableGroup;
 import com.intellij.openapi.options.OptionsBundle;
 
@@ -28,7 +29,7 @@ import com.intellij.openapi.options.OptionsBundle;
  */
 public class IdeConfigurablesGroup extends ConfigurablesGroupBase implements ConfigurableGroup {
   public IdeConfigurablesGroup() {
-    super(ApplicationManager.getApplication(), ConfigurableExtensionPointUtil.APPLICATION_CONFIGURABLES, true);
+    super(ApplicationManager.getApplication(), Configurable.APPLICATION_CONFIGURABLE, true);
   }
 
   public String getDisplayName() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java
index 7b59b0fe75c7..721392b5870d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java
@@ -28,7 +28,7 @@ public class ProjectConfigurablesGroup extends ConfigurablesGroupBase implements
   private final Project myProject;
 
   public ProjectConfigurablesGroup(Project project) {
-    super(project, ConfigurableExtensionPointUtil.PROJECT_CONFIGURABLES, true);
+    super(project, Configurable.PROJECT_CONFIGURABLE, true);
     myProject = project;
   }