diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt
index 1f0d80f4c73..2d47f86f23c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt
@@ -69,13 +69,13 @@ class ChangeFunctionLiteralSignatureFix(
             return diagnosticWithParameters.psiElement as? JetFunctionLiteral
         }
 
-        override fun createQuickFixData(element: JetFunctionLiteral, diagnostic: Diagnostic): Data? {
+        override fun extractFixData(element: JetFunctionLiteral, diagnostic: Diagnostic): Data? {
             val descriptor = element.resolveToDescriptor() as? FunctionDescriptor ?: return null
             val parameterTypes = Errors.EXPECTED_PARAMETERS_NUMBER_MISMATCH.cast(diagnostic).b
             return Data(element, descriptor, parameterTypes)
         }
 
-        override fun createQuickFix(data: Data)
+        override fun createFix(data: Data)
                 = ChangeFunctionLiteralSignatureFix(data.functionLiteral, data.descriptor, data.parameterTypes)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt
index 9f25b162df8..4e01f6f2e28 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt
@@ -83,12 +83,12 @@ abstract class ChangeFunctionSignatureFix(
             return diagnostic.psiElement.getNonStrictParentOfType<JetCallElement>()
         }
 
-        override fun createQuickFixData(element: JetCallElement, diagnostic: Diagnostic): Data? {
+        override fun extractFixData(element: JetCallElement, diagnostic: Diagnostic): Data? {
             val descriptor = DiagnosticFactory.cast(diagnostic, Errors.TOO_MANY_ARGUMENTS, Errors.NO_VALUE_FOR_PARAMETER).a
             return Data(element, descriptor)
         }
 
-        override fun createQuickFix(data: Data) = createFix(data.callElement, data.callElement, data.descriptor)
+        override fun createFix(data: Data) = createFix(data.callElement, data.callElement, data.descriptor)
 
         private fun createFix(callElement: JetCallElement, context: PsiElement, descriptor: CallableDescriptor): ChangeFunctionSignatureFix? {
             val functionDescriptor = when (descriptor) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt
index 64ad993c51b..3f2da81f791 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt
@@ -30,16 +30,16 @@ abstract class KotlinSingleIntentionActionFactoryWithDelegate<E : JetElement, D
         private val isLowPriority: Boolean = false
 ) : KotlinIntentionActionFactoryWithDelegate<E, D>() {
 
-    protected abstract fun createQuickFix(data: D): IntentionAction?
+    protected abstract fun createFix(data: D): IntentionAction?
 
-    protected override final fun createQuickFixes(
+    protected override final fun createFixes(
             originalElementPointer: SmartPsiElementPointer<E>,
             diagnostic: Diagnostic,
             quickFixDataFactory: () -> D?
     ): List<QuickFixWithDelegateFactory> {
         fun createAction(): IntentionAction? {
             val data = quickFixDataFactory() ?: return null
-            return createQuickFix(data)
+            return createFix(data)
         }
 
         val delegateFactory = if (isLowPriority)
@@ -53,13 +53,13 @@ abstract class KotlinSingleIntentionActionFactoryWithDelegate<E : JetElement, D
 abstract class KotlinIntentionActionFactoryWithDelegate<E : JetElement, D : Any> : JetIntentionActionsFactory() {
     protected abstract fun getElementOfInterest(diagnostic: Diagnostic): E?
 
-    protected abstract fun createQuickFixes(
+    protected abstract fun createFixes(
             originalElementPointer: SmartPsiElementPointer<E>,
             diagnostic: Diagnostic,
             quickFixDataFactory: () -> D?
     ): List<QuickFixWithDelegateFactory>
 
-    protected abstract fun createQuickFixData(element: E, diagnostic: Diagnostic): D?
+    protected abstract fun extractFixData(element: E, diagnostic: Diagnostic): D?
 
     override final fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction>? {
         val diagnosticMessage = DefaultErrorMessages.render(diagnostic)
@@ -74,7 +74,7 @@ abstract class KotlinIntentionActionFactoryWithDelegate<E : JetElement, D : Any>
         // Cache null values
         var cachedData: Ref<D>? = null
         val actions: List<QuickFixWithDelegateFactory> = try {
-            createQuickFixes(originalElementPointer, diagnostic) factory@ {
+            createFixes(originalElementPointer, diagnostic) factory@ {
                 val element = originalElementPointer.element ?: return@factory null
                 val diagnosticElement = diagnosticElementPointer.element ?: return@factory null
                 if (!diagnosticElement.isValid || !element.isValid) return@factory null
@@ -85,7 +85,7 @@ abstract class KotlinIntentionActionFactoryWithDelegate<E : JetElement, D : Any>
                                 .forElement(diagnosticElement)
                                 .firstOrNull { DefaultErrorMessages.render(it) == diagnosticMessage } ?: return@factory null
                 if (cachedData == null) {
-                    cachedData = Ref(createQuickFixData(element, currentDiagnostic))
+                    cachedData = Ref(extractFixData(element, currentDiagnostic))
                 }
                 cachedData!!.get()
             }.filter { it.isAvailable(project, null, file) }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt
index 2cdd4d17423..5258d1fc80b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt
@@ -44,10 +44,10 @@ public abstract class CreateCallableMemberFromUsageFactory<E : JetElement>(
 
     protected open fun createCallableInfo(element: E, diagnostic: Diagnostic): CallableInfo? = null
 
-    override fun createQuickFixData(element: E, diagnostic: Diagnostic): List<CallableInfo>
+    override fun extractFixData(element: E, diagnostic: Diagnostic): List<CallableInfo>
             = createCallableInfo(element, diagnostic).singletonOrEmptyList()
 
-    override fun createQuickFixes(
+    override fun createFixes(
             originalElementPointer: SmartPsiElementPointer<E>,
             diagnostic: Diagnostic,
             quickFixDataFactory: () -> List<CallableInfo>?
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreatePropertyDelegateAccessorsActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreatePropertyDelegateAccessorsActionFactory.kt
index 56898e6f168..3ed47e26fdb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreatePropertyDelegateAccessorsActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreatePropertyDelegateAccessorsActionFactory.kt
@@ -39,7 +39,7 @@ object CreatePropertyDelegateAccessorsActionFactory : CreateCallableMemberFromUs
         return diagnostic.psiElement as? JetExpression
     }
 
-    override fun createQuickFixData(element: JetExpression, diagnostic: Diagnostic): List<CallableInfo> {
+    override fun extractFixData(element: JetExpression, diagnostic: Diagnostic): List<CallableInfo> {
         val context = element.analyze()
 
         fun isApplicableForAccessor(accessor: PropertyAccessorDescriptor?): Boolean =
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt
index ac67b2b1771..9400d53a0ca 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt
@@ -51,7 +51,7 @@ public object CreateClassFromCallWithConstructorCalleeActionFactory : CreateClas
         return (if (element is JetAnnotationEntry) ClassKind.ANNOTATION_CLASS else ClassKind.PLAIN_CLASS).singletonList()
     }
 
-    override fun createQuickFixData(element: JetCallElement, diagnostic: Diagnostic): ClassInfo? {
+    override fun extractFixData(element: JetCallElement, diagnostic: Diagnostic): ClassInfo? {
         val isAnnotation = element is JetAnnotationEntry
         val callee = element.calleeExpression as? JetConstructorCalleeExpression ?: return null
         val calleeRef = callee.constructorReferenceExpression ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt
index 289b347e474..c494ad3eaf6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt
@@ -54,7 +54,7 @@ public object CreateClassFromConstructorCallActionFactory: CreateClassFromUsageF
         return classKind.singletonList()
     }
 
-    override fun createQuickFixData(element: JetCallExpression, diagnostic: Diagnostic): ClassInfo? {
+    override fun extractFixData(element: JetCallExpression, diagnostic: Diagnostic): ClassInfo? {
         val diagElement = diagnostic.psiElement
         if (diagElement.getNonStrictParentOfType<JetTypeReference>() != null) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt
index 1ccd9d1da4b..0d1717a0f0c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt
@@ -111,7 +111,7 @@ public object CreateClassFromReferenceExpressionActionFactory : CreateClassFromU
                 }
     }
 
-    override fun createQuickFixData(element: JetSimpleNameExpression, diagnostic: Diagnostic): ClassInfo? {
+    override fun extractFixData(element: JetSimpleNameExpression, diagnostic: Diagnostic): ClassInfo? {
         val file = element.containingFile as? JetFile ?: return null
 
         val name = element.getReferencedName()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt
index 2bf737e6d07..b5136049970 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt
@@ -58,7 +58,7 @@ public object CreateClassFromTypeReferenceActionFactory : CreateClassFromUsageFa
         }
     }
 
-    override fun createQuickFixData(element: JetUserType, diagnostic: Diagnostic): ClassInfo? {
+    override fun extractFixData(element: JetUserType, diagnostic: Diagnostic): ClassInfo? {
         val name = element.referenceExpression?.getReferencedName() ?: return null
         if (element.parent?.parent is JetConstructorCalleeExpression) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt
index 2b60fe0e816..0d79933e57b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetElement
 abstract class CreateClassFromUsageFactory<E : JetElement> : KotlinIntentionActionFactoryWithDelegate<E, ClassInfo>() {
     protected abstract fun getPossibleClassKinds(element: E, diagnostic: Diagnostic): List<ClassKind>
 
-    override fun createQuickFixes(
+    override fun createFixes(
             originalElementPointer: SmartPsiElementPointer<E>,
             diagnostic: Diagnostic,
             quickFixDataFactory: () -> ClassInfo?
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt
index 2d84bc6cbf8..04283de2cef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt
@@ -36,7 +36,7 @@ public object CreateParameterByNamedArgumentActionFactory: CreateParameterFromUs
         return if (argument.isNamed()) argument else null
     }
 
-    override fun createQuickFixData(element: JetValueArgument, diagnostic: Diagnostic): CreateParameterData<JetValueArgument>? {
+    override fun extractFixData(element: JetValueArgument, diagnostic: Diagnostic): CreateParameterData<JetValueArgument>? {
         val result = (diagnostic.psiFile as? JetFile)?.analyzeFullyAndGetResult() ?: return null
         val context = result.bindingContext
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
index 2d2ebb4e83e..b6e2e1f1eb9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
@@ -52,7 +52,7 @@ object CreateParameterByRefActionFactory : CreateParameterFromUsageFactory<JetSi
         return refExpr
     }
 
-    override fun createQuickFixData(
+    override fun extractFixData(
             element: JetSimpleNameExpression,
             diagnostic: Diagnostic
     ): CreateParameterData<JetSimpleNameExpression>? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt
index 9f85d0adae0..04a24f68b6e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt
@@ -30,7 +30,7 @@ data class CreateParameterData<E : JetElement>(
 )
 
 abstract class CreateParameterFromUsageFactory<E : JetElement>: KotlinSingleIntentionActionFactoryWithDelegate<E, CreateParameterData<E>>() {
-    override fun createQuickFix(data: CreateParameterData<E>): IntentionAction? {
+    override fun createFix(data: CreateParameterData<E>): IntentionAction? {
         return CreateParameterFromUsageFix(
                 data.parameterInfo.callableDescriptor as FunctionDescriptor,
                 data.parameterInfo,