diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceIndexBuildParametersProvider.java b/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceIndexBuildParametersProvider.java
index 09dc96ec9bad..24e6b55697cf 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceIndexBuildParametersProvider.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceIndexBuildParametersProvider.java
@@ -16,7 +16,7 @@
 package com.intellij.compiler;
 
 import com.intellij.compiler.server.BuildProcessParametersProvider;
-import com.intellij.find.bytecode.CompilerReferenceService;
+import com.intellij.find.compiler.CompilerReferenceService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.backwardRefs.BackwardReferenceIndexWriter;
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java
index 5bb7b150f1c4..c3834f091122 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.compiler;
 
-import com.intellij.find.bytecode.CompilerReferenceService;
+import com.intellij.find.compiler.CompilerReferenceService;
 import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompileTask;
 import com.intellij.openapi.compiler.CompilerManager;
diff --git a/java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesTest.java b/java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesTest.java
index 9841deab15bf..e8e8c6641d36 100644
--- a/java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesTest.java
+++ b/java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesTest.java
@@ -17,7 +17,7 @@ package com.intellij.compiler;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.completion.AbstractCompilerAwareTest;
-import com.intellij.find.bytecode.CompilerReferenceService;
+import com.intellij.find.compiler.CompilerReferenceService;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMember;
diff --git a/platform/indexing-impl/src/com/intellij/find/bytecode/CompilerReferenceScopeOptimizer.java b/platform/indexing-impl/src/com/intellij/find/compiler/CompilerReferenceScopeOptimizer.java
similarity index 96%
rename from platform/indexing-impl/src/com/intellij/find/bytecode/CompilerReferenceScopeOptimizer.java
rename to platform/indexing-impl/src/com/intellij/find/compiler/CompilerReferenceScopeOptimizer.java
index 03f492f780c0..2b0a86f597c1 100644
--- a/platform/indexing-impl/src/com/intellij/find/bytecode/CompilerReferenceScopeOptimizer.java
+++ b/platform/indexing-impl/src/com/intellij/find/compiler/CompilerReferenceScopeOptimizer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.find.bytecode;
+package com.intellij.find.compiler;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
diff --git a/platform/indexing-impl/src/com/intellij/find/bytecode/CompilerReferenceService.java b/platform/indexing-impl/src/com/intellij/find/compiler/CompilerReferenceService.java
similarity index 97%
rename from platform/indexing-impl/src/com/intellij/find/bytecode/CompilerReferenceService.java
rename to platform/indexing-impl/src/com/intellij/find/compiler/CompilerReferenceService.java
index 1abbacd0d3d0..d494f0873c2d 100644
--- a/platform/indexing-impl/src/com/intellij/find/bytecode/CompilerReferenceService.java
+++ b/platform/indexing-impl/src/com/intellij/find/compiler/CompilerReferenceService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.find.bytecode;
+package com.intellij.find.compiler;
 
 import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.project.Project;
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 1491573a1384..f9d8becc1421 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -76,7 +76,7 @@
     </component>
 
     <component>
-      <interface-class>com.intellij.find.bytecode.CompilerReferenceService</interface-class>
+      <interface-class>com.intellij.find.compiler.CompilerReferenceService</interface-class>
       <implementation-class>com.intellij.compiler.CompilerReferenceServiceImpl</implementation-class>
     </component>
   </project-components>
@@ -1803,7 +1803,7 @@
 
     <fileBasedIndex implementation="com.intellij.psi.impl.search.JavaNullMethodArgumentIndex"/>
 
-    <useScopeOptimizer implementation="com.intellij.find.bytecode.CompilerReferenceScopeOptimizer"/>
+    <useScopeOptimizer implementation="com.intellij.find.compiler.CompilerReferenceScopeOptimizer"/>
   </extensions>
 
   <actions>