diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt
index 30ca9cb2c1f..16931c3a82f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt
@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.resolve
 import org.jetbrains.kotlin.container.StorageComponentContainer
 import org.jetbrains.kotlin.container.useImpl
 import org.jetbrains.kotlin.container.useInstance
-import org.jetbrains.kotlin.resolve.lazy.LocalDescriptorResolverForCompiler
+import org.jetbrains.kotlin.resolve.lazy.CompilerLocalDescriptorResolver
 
 public object CompilerEnvironment : TargetEnvironment("Compiler") {
     override fun configure(container: StorageComponentContainer) {
         container.useInstance(BodyResolveCache.ThrowException)
-        container.useImpl<LocalDescriptorResolverForCompiler>()
+        container.useImpl<CompilerLocalDescriptorResolver>()
     }
 }
\ No newline at end of file
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LocalDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LocalDescriptorResolver.kt
index 3395fe0bd0f..afc15bad769 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LocalDescriptorResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LocalDescriptorResolver.kt
@@ -26,7 +26,7 @@ public interface LocalDescriptorResolver {
     fun resolveLocalDeclaration(declaration: JetDeclaration): DeclarationDescriptor
 }
 
-public class LocalDescriptorResolverForCompiler(
+public class CompilerLocalDescriptorResolver(
         private val lazyDeclarationResolver: LazyDeclarationResolver
 ) : LocalDescriptorResolver {
     override fun resolveLocalDeclaration(declaration: JetDeclaration): DeclarationDescriptor {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
index 1069eaf3461..a9a2153c67f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.context.GlobalContextImpl
 import org.jetbrains.kotlin.context.withProject
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.idea.project.IdeEnvironment
+import org.jetbrains.kotlin.idea.project.IdeaEnvironment
 import org.jetbrains.kotlin.load.java.structure.JavaClass
 import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
 import org.jetbrains.kotlin.psi.JetFile
@@ -64,7 +64,7 @@ fun createModuleResolverProvider(
 
         val resolverForProject = analyzerFacade.setupResolverForProject(
                 globalContext.withProject(project), modulesToCreateResolversFor, modulesContent,
-                jvmPlatformParameters, IdeEnvironment, delegateProvider.resolverForProject
+                jvmPlatformParameters, IdeaEnvironment, delegateProvider.resolverForProject
         )
         return resolverForProject
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeEnvironment.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeaEnvironment.kt
similarity index 84%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeEnvironment.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeaEnvironment.kt
index 10608ba1663..93155f8e665 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeEnvironment.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeaEnvironment.kt
@@ -20,8 +20,9 @@ import org.jetbrains.kotlin.container.StorageComponentContainer
 import org.jetbrains.kotlin.container.useImpl
 import org.jetbrains.kotlin.resolve.TargetEnvironment
 
-public object IdeEnvironment : TargetEnvironment("Ide") {
+public object IdeaEnvironment : TargetEnvironment("Idea") {
     override fun configure(container: StorageComponentContainer) {
-        container.useImpl<LocalDescriptorResolverForIde>()
+        container.useImpl<ResolveElementCache>()
+        container.useImpl<IdeaLocalDescriptorResolver>()
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/LocalDescriptorResolverForIde.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeaLocalDescriptorResolver.kt
similarity index 97%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/LocalDescriptorResolverForIde.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeaLocalDescriptorResolver.kt
index cc77f8fd8ca..50f198a907d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/LocalDescriptorResolverForIde.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeaLocalDescriptorResolver.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.BindingContextUtils
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.lazy.LocalDescriptorResolver
 
-public class LocalDescriptorResolverForIde(
+public class IdeaLocalDescriptorResolver(
         private val resolveElementCache: ResolveElementCache
 ): LocalDescriptorResolver {
     override fun resolveLocalDeclaration(declaration: JetDeclaration): DeclarationDescriptor {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt
index 7c87fab9ae4..c7485b32ac7 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.resolve
 import org.jetbrains.kotlin.container.ComponentProvider
 import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.project.IdeEnvironment
+import org.jetbrains.kotlin.idea.project.IdeaEnvironment
 import org.jetbrains.kotlin.idea.project.ResolveElementCache
 import org.jetbrains.kotlin.psi.JetClassInitializer
 import org.jetbrains.kotlin.psi.JetDeclaration
@@ -41,5 +41,5 @@ public abstract class AbstractAdditionalResolveDescriptorRendererTest : Abstract
     }
 
     override val targetEnvironment: TargetEnvironment
-        get() = IdeEnvironment
+        get() = IdeaEnvironment
 }