diff --git a/.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml b/.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml
index 514a55f63f1..acc1bab4b88 100644
--- a/.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml
+++ b/.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml
@@ -4,11 +4,11 @@
     <module name="kannotator-jps-plugin-test" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.jet.jps.build.kannotator" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.jps.build.kannotator" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />
diff --git a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
similarity index 95%
rename from jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
rename to jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
index 47ec7b8c5ae..3e96fafcbd3 100644
--- a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
+++ b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.build.kannotator;
+package org.jetbrains.kotlin.jps.build.kannotator;
 
 import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.jps.build.AbstractKotlinJpsBuildTestCase;
 import org.jetbrains.jps.builders.BuildResult;
 import org.jetbrains.jps.model.module.JpsModule;
@@ -81,6 +82,7 @@ public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
         System.out.println("'Rebuild all' finished");
     }
 
+    @NotNull
     @Override
     protected BuildResult makeAll() {
         System.out.println("'Make all' started");