diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SyntheticExtensionsScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SyntheticExtensionsScope.kt
index 0442717dae0..7a4300cd35e 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SyntheticExtensionsScope.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SyntheticExtensionsScope.kt
@@ -124,7 +124,7 @@ class SyntheticExtensionsScope(storageManager: StorageManager) : JetScope by Jet
         if (classifier is JavaClassDescriptor) {
             for (descriptor in classifier.getMemberScope(type.getArguments()).getAllDescriptors()) {
                 if (descriptor is FunctionDescriptor) {
-                    val propertyName = fromGetMethodName(descriptor.getName()) ?: continue
+                    val propertyName = propertyNameByGetMethodName(descriptor.getName()) ?: continue
                     addIfNotNull(syntheticPropertyInClass(Triple(classifier, type, propertyName)))
                 }
             }
@@ -152,11 +152,11 @@ class SyntheticExtensionsScope(storageManager: StorageManager) : JetScope by Jet
     }
 
     companion object {
-        public fun fromGetMethodName(methodName: Name): Name? = fromAccessorMethodName(methodName, "get")
+        public fun propertyNameByGetMethodName(methodName: Name): Name? = propertyNameFromAccessorMethodName(methodName, "get")
 
-        public fun fromSetMethodName(methodName: Name): Name? = fromAccessorMethodName(methodName, "set")
+        public fun propertyNameBySetMethodName(methodName: Name): Name? = propertyNameFromAccessorMethodName(methodName, "set")
 
-        private fun fromAccessorMethodName(methodName: Name, prefix: String): Name? {
+        private fun propertyNameFromAccessorMethodName(methodName: Name, prefix: String): Name? {
             if (methodName.isSpecial()) return null
             val identifier = methodName.getIdentifier()
             if (!identifier.startsWith(prefix)) return null
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
index 16e3b194e05..8da8fced153 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
@@ -145,9 +145,9 @@ public class JetSimpleNameReference(
             if (Name.isValidIdentifier(newElementName)) {
                 val newNameAsName = Name.identifier(newElementName)
                 val newName = when (access()) {
-                    Access.READ -> SyntheticExtensionsScope.fromGetMethodName(newNameAsName)
-                    Access.WRITE -> SyntheticExtensionsScope.fromSetMethodName(newNameAsName)
-                    Access.READ_WRITE -> SyntheticExtensionsScope.fromGetMethodName(newNameAsName) ?: SyntheticExtensionsScope.fromSetMethodName(newNameAsName)
+                    Access.READ -> SyntheticExtensionsScope.propertyNameByGetMethodName(newNameAsName)
+                    Access.WRITE -> SyntheticExtensionsScope.propertyNameBySetMethodName(newNameAsName)
+                    Access.READ_WRITE -> SyntheticExtensionsScope.propertyNameByGetMethodName(newNameAsName) ?: SyntheticExtensionsScope.propertyNameBySetMethodName(newNameAsName)
                 } ?: return expression //TODO: handle the case when get/set becomes ordinary method
                 newElementName = newName.getIdentifier()
             }