diff --git a/platform/core-api/src/com/intellij/util/PlatformUtilsCore.java b/platform/core-api/src/com/intellij/util/PlatformUtilsCore.java
index 7e4ff81b69a1..0ea0b5a6eb60 100644
--- a/platform/core-api/src/com/intellij/util/PlatformUtilsCore.java
+++ b/platform/core-api/src/com/intellij/util/PlatformUtilsCore.java
@@ -22,7 +22,7 @@ public class PlatformUtilsCore {
   public static final String IDEA_PREFIX = "idea";
   public static final String COMMUNITY_PREFIX = "Idea";
   public static final String APPCODE_PREFIX = "AppCode";
-  public static final String CPP_PREFIX = "CppIde";
+  public static final String CLION_PREFIX = "CLion";
   public static final String PYCHARM_PREFIX = "Python";
   public static final String PYCHARM_PREFIX2 = "PyCharmCore";
   public static final String RUBY_PREFIX = "Ruby";
@@ -59,8 +59,8 @@ public class PlatformUtilsCore {
     return APPCODE_PREFIX.equals(getPlatformPrefix());
   }
 
-  public static boolean isCppIde() {
-    return CPP_PREFIX.equals(getPlatformPrefix());
+  public static boolean isCLion() {
+    return CLION_PREFIX.equals(getPlatformPrefix());
   }
 
   public static boolean isPyCharm() {
diff --git a/platform/platform-api/src/com/intellij/util/PlatformUtils.java b/platform/platform-api/src/com/intellij/util/PlatformUtils.java
index 064b5ccc48b6..dfcb5ccf624f 100644
--- a/platform/platform-api/src/com/intellij/util/PlatformUtils.java
+++ b/platform/platform-api/src/com/intellij/util/PlatformUtils.java
@@ -28,7 +28,7 @@ public class PlatformUtils {
   public static final String IDEA_PREFIX = PlatformUtilsCore.IDEA_PREFIX;
   public static final String IDEA_CE_PREFIX = PlatformUtilsCore.COMMUNITY_PREFIX;
   public static final String APPCODE_PREFIX = PlatformUtilsCore.APPCODE_PREFIX;
-  public static final String CPP_PREFIX = PlatformUtilsCore.CPP_PREFIX;
+  public static final String CLION_PREFIX = PlatformUtilsCore.CLION_PREFIX;
   public static final String PYCHARM_PREFIX = PlatformUtilsCore.PYCHARM_PREFIX;
   public static final String PYCHARM_CE_PREFIX = PlatformUtilsCore.PYCHARM_PREFIX2;
   public static final String RUBY_PREFIX = PlatformUtilsCore.RUBY_PREFIX;
@@ -66,12 +66,12 @@ public class PlatformUtils {
     return PlatformUtilsCore.isAppCode();
   }
 
-  public static boolean isCppIde() {
-    return PlatformUtilsCore.isCppIde();
+  public static boolean isCLion() {
+    return PlatformUtilsCore.isCLion();
   }
 
   public static boolean isCidr() {
-    return isAppCode() || isCppIde();
+    return isAppCode() || isCLion();
   }
 
   public static boolean isPyCharm() {
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
index 2f25eb002b78..af3c193ca9d9 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
@@ -132,7 +132,7 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
     gbc.fill = GridBagConstraints.BOTH;
     gbc.gridx = 0;
     gbc.gridy = 0;
-    if (!PlatformUtils.isCppIde()) {
+    if (!PlatformUtils.isCLion()) {
       buttonPanel.add(mySkipButton, gbc);
       gbc.gridx++;
     }
diff --git a/plugins/devkit/src/run/PluginRunConfiguration.java b/plugins/devkit/src/run/PluginRunConfiguration.java
index ed0764c5581c..2c7361f8f571 100644
--- a/plugins/devkit/src/run/PluginRunConfiguration.java
+++ b/plugins/devkit/src/run/PluginRunConfiguration.java
@@ -163,10 +163,10 @@ public class PluginRunConfiguration extends RunConfigurationBase implements Modu
               prefix = PlatformUtils.WEB_PREFIX;
             }
             else if (buildNumber.startsWith("OC")) {
-              prefix = buildNumber.contains("121") ? "CIDR" : PlatformUtils.APPCODE_PREFIX;
+              prefix = PlatformUtils.APPCODE_PREFIX;
             }
-            else if (buildNumber.startsWith("CP")) {
-              prefix = PlatformUtils.CPP_PREFIX;
+            else if (buildNumber.startsWith("CL")) {
+              prefix = PlatformUtils.CLION_PREFIX;
             }
             else if (buildNumber.startsWith("DB")) {
               prefix = PlatformUtils.DBE_PREFIX;