Rename: this object, receiver argument -> dispatch receiver, extension receiver

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt

@@ -237,8 +237,8 @@ public class LazyJavaClassMemberScope(
         }
     }
 
-    override fun getExpectedThisObject(): ReceiverParameterDescriptor? =
-            DescriptorUtils.getExpectedThisObjectIfNeeded(getContainingDeclaration())
+    override fun getDispatchReceiverParameter(): ReceiverParameterDescriptor? =
+            DescriptorUtils.getDispatchReceiverParameterIfNeeded(getContainingDeclaration())
 
     override fun getClassifier(name: Name): ClassifierDescriptor? = nestedClasses(name)
     override fun getAllClassNames(): Collection<Name> = nestedClassIndex().keySet() + enumEntryIndex().keySet()

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt

@@ -69,7 +69,7 @@ public abstract class LazyJavaMemberScope(
 
     protected abstract fun computeNonDeclaredFunctions(result: MutableCollection<SimpleFunctionDescriptor>, name: Name)
 
-    protected abstract fun getExpectedThisObject(): ReceiverParameterDescriptor?
+    protected abstract fun getDispatchReceiverParameter(): ReceiverParameterDescriptor?
 
     protected abstract fun computeAdditionalFunctions(name: Name): Collection<SimpleFunctionDescriptor>
 
@@ -140,7 +140,7 @@ public abstract class LazyJavaMemberScope(
 
         functionDescriptorImpl.initialize(
                 effectiveSignature.getReceiverType(),
-                getExpectedThisObject(),
+                getDispatchReceiverParameter(),
                 effectiveSignature.getTypeParameters(),
                 effectiveSignature.getValueParameters(),
                 effectiveSignature.getReturnType(),
@@ -258,7 +258,7 @@ public abstract class LazyJavaMemberScope(
             c.externalSignatureResolver.reportSignatureErrors(propertyDescriptor, signatureErrors)
         }
 
-        propertyDescriptor.setType(effectiveSignature.getReturnType(), listOf(), getExpectedThisObject(), null : JetType?)
+        propertyDescriptor.setType(effectiveSignature.getReturnType(), listOf(), getDispatchReceiverParameter(), null : JetType?)
 
         if (DescriptorUtils.shouldRecordInitializerForProperty(propertyDescriptor, propertyDescriptor.getType())) {
             propertyDescriptor.setCompileTimeInitializer(

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt

@@ -40,7 +40,7 @@ public abstract class LazyJavaStaticScope(
         descriptor: ClassOrPackageFragmentDescriptor
 ) : LazyJavaMemberScope(c.withTypes(), descriptor) {
 
-    override fun getExpectedThisObject() = null
+    override fun getDispatchReceiverParameter() = null
 
     // Package fragments are not nested
     override fun getPackage(name: Name) = null

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java

@@ -189,7 +189,7 @@ public class SingleAbstractMethodUtils {
             ) {
                 result.initialize(
                         null,
-                        original.getExpectedThisObject(),
+                        original.getDispatchReceiverParameter(),
                         typeParameters,
                         valueParameters,
                         returnType,