diff --git a/buildSrc/src/main/kotlin/pill/plugin.kt b/buildSrc/src/main/kotlin/pill/plugin.kt
index 639834959cb..916df2e6d3f 100644
--- a/buildSrc/src/main/kotlin/pill/plugin.kt
+++ b/buildSrc/src/main/kotlin/pill/plugin.kt
@@ -176,7 +176,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
     private fun removeJpsAndPillRunConfigurations() {
         File(projectDir, ".idea/runConfigurations")
             .walk()
-            .filter { (it.name.startsWith("JPS_") || it.name.startsWith("PILL_")) && it.extension.toLowerCase() == "xml" }
+            .filter { (it.name.startsWith("JPS_") || it.name.startsWith("Pill_")) && it.extension.toLowerCase() == "xml" }
             .forEach { it.delete() }
     }
 
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_All_Compiler_Tests.xml b/buildSrc/src/main/resources/runConfigurations/Pill_All_Compiler_Tests.xml
similarity index 58%
rename from buildSrc/src/main/resources/runConfigurations/PILL_All_Compiler_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_All_Compiler_Tests.xml
index 48a042bab57..fb0776a5110 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_All_Compiler_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_All_Compiler_Tests.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="[PILL] All Compiler Tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
-    <toRun type="JUnit" name="[PILL] Compiler Tests" />
-    <toRun type="JUnit" name="[PILL] JS Backend Tests" />
-    <toRun type="JUnit" name="[PILL] Java 8 Tests" />
+    <toRun type="JUnit" name="[Pill] Compiler Tests" />
+    <toRun type="JUnit" name="[Pill] JS Backend Tests" />
+    <toRun type="JUnit" name="[Pill] Java 8 Tests" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_All_IDEA_Plugin_Tests.xml b/buildSrc/src/main/resources/runConfigurations/Pill_All_IDEA_Plugin_Tests.xml
similarity index 96%
rename from buildSrc/src/main/resources/runConfigurations/PILL_All_IDEA_Plugin_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_All_IDEA_Plugin_Tests.xml
index d58bc15a04b..5dad44f35aa 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_All_IDEA_Plugin_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_All_IDEA_Plugin_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] All IDEA Plugin Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[Pill] All IDEA Plugin Tests" type="JUnit" factoryName="JUnit">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
       <pattern>
         <option name="PATTERN" value="org.jetbrains.kotlin.*" />
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_Compiler_Tests.xml b/buildSrc/src/main/resources/runConfigurations/Pill_Compiler_Tests.xml
similarity index 95%
rename from buildSrc/src/main/resources/runConfigurations/PILL_Compiler_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_Compiler_Tests.xml
index bd38108fad4..eafeed26386 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_Compiler_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_Compiler_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] Compiler Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[Pill] Compiler Tests" type="JUnit" factoryName="JUnit">
     <module name="compiler.test" />
     <extension name="coverage">
       <pattern>
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_Generate_All_Tests.xml b/buildSrc/src/main/resources/runConfigurations/Pill_Generate_All_Tests.xml
similarity index 84%
rename from buildSrc/src/main/resources/runConfigurations/PILL_Generate_All_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_Generate_All_Tests.xml
index cbfe6465539..d14f11f0c1d 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_Generate_All_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_Generate_All_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] Generate All Tests" type="Application" factoryName="Application">
+  <configuration default="false" name="[Pill] Generate All Tests" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.pill.generateAllTests.Main" />
     <module name="generate-all-tests.test" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_IDEA.xml b/buildSrc/src/main/resources/runConfigurations/Pill_IDEA.xml
similarity index 97%
rename from buildSrc/src/main/resources/runConfigurations/PILL_IDEA.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_IDEA.xml
index d18664140a1..446c208cd3f 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_IDEA.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_IDEA.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] IDEA" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="[Pill] IDEA" type="Application" factoryName="Application" singleton="true">
     <log_file alias="idea.log" path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <module name="idea-runner" />
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_IDEA_No_ProcessCancelledException.xml b/buildSrc/src/main/resources/runConfigurations/Pill_IDEA_No_ProcessCancelledException.xml
similarity index 97%
rename from buildSrc/src/main/resources/runConfigurations/PILL_IDEA_No_ProcessCancelledException.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_IDEA_No_ProcessCancelledException.xml
index 0416cd16dd9..d8bf84ea292 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_IDEA_No_ProcessCancelledException.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_IDEA_No_ProcessCancelledException.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="[Pill] IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
     <log_file alias="idea.log" path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <module name="idea-runner" />
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_JS_Backend_Tests.xml b/buildSrc/src/main/resources/runConfigurations/Pill_JS_Backend_Tests.xml
similarity index 95%
rename from buildSrc/src/main/resources/runConfigurations/PILL_JS_Backend_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_JS_Backend_Tests.xml
index bcbc5451e3b..bda04714224 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_JS_Backend_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_JS_Backend_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] JS Backend Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[Pill] JS Backend Tests" type="JUnit" factoryName="JUnit">
     <module name="js.tests.test" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_JVM_Backend_Tests.xml b/buildSrc/src/main/resources/runConfigurations/Pill_JVM_Backend_Tests.xml
similarity index 95%
rename from buildSrc/src/main/resources/runConfigurations/PILL_JVM_Backend_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_JVM_Backend_Tests.xml
index 555529d35a2..3b4034b8700 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_JVM_Backend_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_JVM_Backend_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] JVM Backend Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[Pill] JVM Backend Tests" type="JUnit" factoryName="JUnit">
     <module name="compiler.test" />
     <extension name="coverage">
       <pattern>
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_Java_8_Tests.xml b/buildSrc/src/main/resources/runConfigurations/Pill_Java_8_Tests.xml
similarity index 94%
rename from buildSrc/src/main/resources/runConfigurations/PILL_Java_8_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_Java_8_Tests.xml
index 7ce9231ae5c..d56a27f6d2a 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_Java_8_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_Java_8_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] Java 8 Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[Pill] Java 8 Tests" type="JUnit" factoryName="JUnit">
     <module name="tests-java8.test" />
     <extension name="coverage">
       <pattern>
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_Refresh_JPS_Model.xml b/buildSrc/src/main/resources/runConfigurations/Pill_Refresh_JPS_Model.xml
similarity index 92%
rename from buildSrc/src/main/resources/runConfigurations/PILL_Refresh_JPS_Model.xml
rename to buildSrc/src/main/resources/runConfigurations/Pill_Refresh_JPS_Model.xml
index 73495e9d380..48c3ae6b6c9 100644
--- a/buildSrc/src/main/resources/runConfigurations/PILL_Refresh_JPS_Model.xml
+++ b/buildSrc/src/main/resources/runConfigurations/Pill_Refresh_JPS_Model.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[PILL] Refresh PILL Model" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
+  <configuration default="false" name="[Pill] Refresh PILL Model" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />