diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
index b7d1d100c1f..0d2d2cb522c 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
@@ -52,7 +52,7 @@ public class LazyJavaClassMemberScope(
         c: LazyJavaResolverContext,
         containingDeclaration: ClassDescriptor,
         private val jClass: JavaClass
-) : LazyJavaMemberScope(c, containingDeclaration) {
+) : LazyJavaScope(c, containingDeclaration) {
 
     override fun computeMemberIndex(): MemberIndex {
         return object : ClassMemberIndex(jClass, { !it.isStatic() }) {
@@ -112,7 +112,7 @@ public class LazyJavaClassMemberScope(
         propertyDescriptor.initialize(getter, null)
 
         val returnType = computeMethodReturnType(method, annotations, c.child(propertyDescriptor, method))
-        propertyDescriptor.setType(returnType, listOf(), getDispatchReceiverParameter(), null : JetType?)
+        propertyDescriptor.setType(returnType, listOf(), getDispatchReceiverParameter(), null as JetType?)
         getter.initialize(returnType)
 
         result.add(propertyDescriptor)
@@ -126,8 +126,8 @@ public class LazyJavaClassMemberScope(
 
     override fun resolveMethodSignature(
             method: JavaMethod, methodTypeParameters: List<TypeParameterDescriptor>, returnType: JetType,
-            valueParameters: LazyJavaMemberScope.ResolvedValueParameters
-    ): LazyJavaMemberScope.MethodSignatureData {
+            valueParameters: LazyJavaScope.ResolvedValueParameters
+    ): LazyJavaScope.MethodSignatureData {
         val propagated = c.externalSignatureResolver.resolvePropagatedSignature(
                 method, getContainingDeclaration(), returnType, null, valueParameters.descriptors, methodTypeParameters
         )
@@ -137,7 +137,7 @@ public class LazyJavaClassMemberScope(
                 propagated.hasStableParameterNames()
         )
 
-        return LazyJavaMemberScope.MethodSignatureData(effectiveSignature, propagated.getErrors() + effectiveSignature.getErrors())
+        return LazyJavaScope.MethodSignatureData(effectiveSignature, propagated.getErrors() + effectiveSignature.getErrors())
     }
 
     private fun resolveConstructor(constructor: JavaConstructor): JavaConstructorDescriptor {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
index e54ee9e5b1d..c186808ae59 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
@@ -25,7 +25,7 @@ class LazyJavaPackageFragment(
         private val c: LazyJavaResolverContext,
         private val jPackage: JavaPackage
 ) : PackageFragmentDescriptorImpl(c.module, jPackage.getFqName()) {
-    private val scope by lazy { LazyPackageFragmentScopeForJavaPackage(c, jPackage, this) }
+    private val scope by lazy { LazyJavaPackageScope(c, jPackage, this) }
 
     private val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues {
         javaClass: JavaClass ->
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
similarity index 99%
rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt
rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
index ebbed2e9dc7..dd8687f779d 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.resolve.scopes.UsageLocation
 import org.jetbrains.kotlin.utils.addIfNotNull
 
-public class LazyPackageFragmentScopeForJavaPackage(
+public class LazyJavaPackageScope(
         c: LazyJavaResolverContext,
         private val jPackage: JavaPackage,
         containingDeclaration: LazyJavaPackageFragment
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
similarity index 99%
rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt
rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
index 9647dfa8b7b..356c98e2838 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.utils.toReadOnlyList
 import java.util.ArrayList
 import java.util.LinkedHashSet
 
-public abstract class LazyJavaMemberScope(
+public abstract class LazyJavaScope(
         protected val c: LazyJavaResolverContext,
         private val containingDeclaration: DeclarationDescriptor
 ) : JetScopeImpl() {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt
index eb3c02bd11e..69b406d1301 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.JetType
 public abstract class LazyJavaStaticScope(
         c: LazyJavaResolverContext,
         descriptor: ClassOrPackageFragmentDescriptor
-) : LazyJavaMemberScope(c, descriptor) {
+) : LazyJavaScope(c, descriptor) {
 
     override fun getDispatchReceiverParameter() = null
 
@@ -41,11 +41,11 @@ public abstract class LazyJavaStaticScope(
 
     override fun resolveMethodSignature(
             method: JavaMethod, methodTypeParameters: List<TypeParameterDescriptor>, returnType: JetType,
-            valueParameters: LazyJavaMemberScope.ResolvedValueParameters
-    ): LazyJavaMemberScope.MethodSignatureData {
+            valueParameters: LazyJavaScope.ResolvedValueParameters
+    ): LazyJavaScope.MethodSignatureData {
         val effectiveSignature = c.externalSignatureResolver.resolveAlternativeMethodSignature(
                 method, false, returnType, null, valueParameters.descriptors, methodTypeParameters, false)
-        return LazyJavaMemberScope.MethodSignatureData(effectiveSignature, effectiveSignature.getErrors())
+        return LazyJavaScope.MethodSignatureData(effectiveSignature, effectiveSignature.getErrors())
     }
 
     override fun computeNonDeclaredProperties(name: Name, result: MutableCollection<PropertyDescriptor>) {