diff --git a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinPsiUpdateModCommandAction.kt b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinPsiUpdateModCommandAction.kt
index 2ec99e72297d..fb470652dc24 100644
--- a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinPsiUpdateModCommandAction.kt
+++ b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinPsiUpdateModCommandAction.kt
@@ -46,19 +46,19 @@ sealed class KotlinPsiUpdateModCommandAction<E : PsiElement, C : Any> private co
      */
     @RequiresBackgroundThread
     protected abstract fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: E,
         elementContext: C,
         updater: ModPsiUpdater,
     )
 
     protected abstract fun getElementContext(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: E,
     ): C?
 
     protected open fun getActionName(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: E,
         elementContext: C,
     ): @IntentionName String = familyName
@@ -76,7 +76,7 @@ sealed class KotlinPsiUpdateModCommandAction<E : PsiElement, C : Any> private co
     ) : KotlinPsiUpdateModCommandAction<E, C>(element, null) {
 
         final override fun getElementContext(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: E,
         ): C = elementContext
     }
@@ -87,7 +87,7 @@ sealed class KotlinPsiUpdateModCommandAction<E : PsiElement, C : Any> private co
         ContextProvider<E, C> {
 
         final override fun getElementContext(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: E,
         ): C? = getElementContext(element)
     }
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddDataModifierFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddDataModifierFixFactory.kt
index ff5a4c5871c1..24b2a8452d53 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddDataModifierFixFactory.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddDataModifierFixFactory.kt
@@ -62,7 +62,7 @@ internal object AddDataModifierFixFactory {
     ) : KotlinPsiUpdateModCommandAction.ElementBased<KtClass, ElementContext>(ktClass, context) {
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtClass,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt
index b3c98d1f057b..51771388aa5f 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt
@@ -55,7 +55,7 @@ internal object AddFunModifierFixFactory {
         KotlinPsiUpdateModCommandAction.ElementBased<KtClass, ElementContext>(ktClass, context) {
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtClass,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFix.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFix.kt
index 8afe0e8fd4f9..83bd0a3e1c93 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFix.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFix.kt
@@ -44,7 +44,7 @@ internal object AddInlineModifierFix {
     ) : KotlinPsiUpdateModCommandAction.ElementBased<KtParameter, ElementContext>(parameter, context) {
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtParameter,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
@@ -55,7 +55,7 @@ internal object AddInlineModifierFix {
             }
         }
 
-        override fun getActionName(context: ActionContext, element: KtParameter, elementContext: ElementContext): String {
+        override fun getActionName(actionContext: ActionContext, element: KtParameter, elementContext: ElementContext): String {
             return KotlinBundle.message("fix.add.modifier.inline.parameter.text", elementContext.modifier, element.name.toString())
         }
 
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddSuspendModifierFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddSuspendModifierFixFactory.kt
index 9ce71f06409e..c5f1efd2304b 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddSuspendModifierFixFactory.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddSuspendModifierFixFactory.kt
@@ -37,7 +37,7 @@ internal object AddSuspendModifierFixFactory {
     ) : KotlinPsiUpdateModCommandAction.ElementBased<KtModifierListOwner, ElementContext>(element, context) {
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtModifierListOwner,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CastExpressionFixFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CastExpressionFixFactories.kt
index f2d3563a1d97..07c38fc13163 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CastExpressionFixFactories.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CastExpressionFixFactories.kt
@@ -37,7 +37,7 @@ object CastExpressionFixFactories {
         override fun getFamilyName(): String = KotlinBundle.message("fix.cast.expression.family")
 
         override fun getActionName(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: PsiElement,
             elementContext: ElementContext,
         ): String = KotlinBundle.message(
@@ -47,12 +47,12 @@ object CastExpressionFixFactories {
         )
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: PsiElement,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
         ) {
-            val expressionToInsert = KtPsiFactory(context.project)
+            val expressionToInsert = KtPsiFactory(actionContext.project)
                 .createExpressionByPattern(
                     "$0 as $1",
                     element,
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt
index 2e27e2e80905..ef8993e2ddd9 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt
@@ -38,7 +38,7 @@ object ChangeVisibilityFixFactories {
         )
 
         override fun getActionName(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtDeclaration,
             elementContext: ElementContext,
         ): String = KotlinBundle.message(
@@ -48,7 +48,7 @@ object ChangeVisibilityFixFactories {
         )
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtDeclaration,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/InitializePropertyQuickFixFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/InitializePropertyQuickFixFactories.kt
index 4f96f7233810..0caf78962cb6 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/InitializePropertyQuickFixFactories.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/InitializePropertyQuickFixFactories.kt
@@ -30,12 +30,12 @@ object InitializePropertyQuickFixFactories {
         override fun getFamilyName(): String = KotlinBundle.message("add.initializer")
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtProperty,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
         ) {
-            val expression = KtPsiFactory(context.project)
+            val expression = KtPsiFactory(actionContext.project)
                 .createExpression(elementContext.initializerText)
             val initializer = element.setInitializer(expression)!!
             updater.select(TextRange(initializer.startOffset, initializer.endOffset))
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SimplifyComparisonFix.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SimplifyComparisonFix.kt
index 8a5db36f7303..ae3d1a3b065c 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SimplifyComparisonFix.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SimplifyComparisonFix.kt
@@ -38,7 +38,7 @@ object SimplifyComparisonFixFactory {
     ) : KotlinPsiUpdateModCommandAction.ElementBased<KtExpression, ElementContext>(psiElement, context) {
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtExpression,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt
index de34daa10602..fbefd397c5a1 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt
@@ -73,12 +73,12 @@ internal object SuperClassNotInitializedFactories {
         )
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtSuperTypeEntry,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
         ) {
-            val withParenthesis = element.replaced(KtPsiFactory(context.project).createSuperTypeCallEntry(element.text + "()"))
+            val withParenthesis = element.replaced(KtPsiFactory(actionContext.project).createSuperTypeCallEntry(element.text + "()"))
             if (elementContext.moveCaretIntoParenthesis) {
                 withParenthesis.valueArgumentList?.leftParenthesis?.endOffset?.let { offset ->
                     updater.moveCaretTo(offset)
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SurroundWithArrayOfWithSpreadOperatorInFunctionFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SurroundWithArrayOfWithSpreadOperatorInFunctionFixFactory.kt
index 26b0afe3090e..4321ae08d77f 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SurroundWithArrayOfWithSpreadOperatorInFunctionFixFactory.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SurroundWithArrayOfWithSpreadOperatorInFunctionFixFactory.kt
@@ -32,13 +32,13 @@ object SurroundWithArrayOfWithSpreadOperatorInFunctionFixFactory {
         override fun getFamilyName(): String = KotlinBundle.message("surround.with.array.of")
 
         override fun getActionName(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtExpression,
             elementContext: ElementContext,
         ): String = KotlinBundle.getMessage("surround.with.0", elementContext.shortArrayOfCall)
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtExpression,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrapWithSafeLetCallFixFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrapWithSafeLetCallFixFactories.kt
index 68ab60e0aa76..a2d9b8a50641 100644
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrapWithSafeLetCallFixFactories.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrapWithSafeLetCallFixFactories.kt
@@ -68,7 +68,7 @@ object WrapWithSafeLetCallFixFactories {
         override fun getFamilyName(): String = KotlinBundle.message("wrap.with.let.call")
 
         override fun invoke(
-            context: ActionContext,
+            actionContext: ActionContext,
             element: KtExpression,
             elementContext: ElementContext,
             updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddFullQualifierIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddFullQualifierIntention.kt
index 0652c7fdc8c5..ee383478a5e1 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddFullQualifierIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddFullQualifierIntention.kt
@@ -34,7 +34,7 @@ internal class AddFullQualifierIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtNameReferenceExpression,
         elementContext: Context,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNameToArgumentIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNameToArgumentIntention.kt
index 25519bcd5625..8aedd565726d 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNameToArgumentIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNameToArgumentIntention.kt
@@ -29,9 +29,9 @@ internal class AddNameToArgumentIntention :
     override fun getFamilyName(): String = KotlinBundle.message("add.name.to.argument")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtValueArgument,
-        elementContext: Context,
+      actionContext: ActionContext,
+      element: KtValueArgument,
+      elementContext: Context,
     ): String = KotlinBundle.message("add.0.to.argument", elementContext.argumentName)
 
     override fun getApplicableRanges(element: KtValueArgument): List<TextRange> =
@@ -56,7 +56,7 @@ internal class AddNameToArgumentIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtValueArgument,
         elementContext: Context,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesInCommentToJavaCallArgumentsIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesInCommentToJavaCallArgumentsIntention.kt
index d1ee2863d692..080c0c212350 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesInCommentToJavaCallArgumentsIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesInCommentToJavaCallArgumentsIntention.kt
@@ -35,10 +35,10 @@ internal class AddNamesInCommentToJavaCallArgumentsIntention :
     override fun prepareContext(element: KtCallElement): Context? = getArgumentNameComments(element)?.let { Context(it) }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallElement,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallElement,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         val nameCommentsMap = elementContext.nameCommentsByArgument.dereferenceValidKeys()
         val psiFactory = KtPsiFactory(element)
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToCallArgumentsIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToCallArgumentsIntention.kt
index a217b7a21cb3..d1ce0bf31df3 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToCallArgumentsIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToCallArgumentsIntention.kt
@@ -53,10 +53,10 @@ internal class AddNamesToCallArgumentsIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallElement,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallElement,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         addArgumentNames(elementContext.argumentNames.dereferenceValidKeys())
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToFollowingArgumentsIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToFollowingArgumentsIntention.kt
index 288af10d47be..ac66e6f3a762 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToFollowingArgumentsIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddNamesToFollowingArgumentsIntention.kt
@@ -57,10 +57,10 @@ internal class AddNamesToFollowingArgumentsIntention :
             ?.let(::Context)
 
     override fun invoke(
-        context: ActionContext,
-        element: KtValueArgument,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtValueArgument,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         addArgumentNames(elementContext.argumentNames.dereferenceValidKeys())
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddOpenModifierIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddOpenModifierIntention.kt
index 36a6c2e8b7e9..5a4689577241 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddOpenModifierIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddOpenModifierIntention.kt
@@ -54,10 +54,10 @@ internal class AddOpenModifierIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallableDeclaration,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallableDeclaration,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         element.addModifier(KtTokens.OPEN_KEYWORD)
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddPropertyAccessorsIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddPropertyAccessorsIntention.kt
index 9386a5a5f359..6bc0cd7dc437 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddPropertyAccessorsIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddPropertyAccessorsIntention.kt
@@ -65,10 +65,10 @@ internal abstract class AbstractAddAccessorIntention(
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtProperty,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtProperty,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         addAccessors(element, addGetter, addSetter, updater::moveCaretTo)
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddWhenRemainingBranchesIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddWhenRemainingBranchesIntention.kt
index 6a29ee031445..aee201dd5aea 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddWhenRemainingBranchesIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/AddWhenRemainingBranchesIntention.kt
@@ -27,10 +27,10 @@ internal class AddWhenRemainingBranchesIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtWhenExpression,
-        elementContext: AddRemainingWhenBranchesUtils.Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtWhenExpression,
+      elementContext: AddRemainingWhenBranchesUtils.Context,
+      updater: ModPsiUpdater,
     ) {
         addRemainingWhenBranches(element, elementContext)
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ChangeVisibilityModifierIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ChangeVisibilityModifierIntention.kt
index 4bcde1e7d133..9a09a0c69bd1 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ChangeVisibilityModifierIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ChangeVisibilityModifierIntention.kt
@@ -29,7 +29,7 @@ sealed class ChangeVisibilityModifierIntention(
 ) : KotlinApplicableModCommandAction<KtDeclaration, Unit>(KtDeclaration::class) {
 
     override fun getActionName(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtDeclaration,
         elementContext: Unit,
     ): String {
@@ -117,7 +117,7 @@ sealed class ChangeVisibilityModifierIntention(
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtDeclaration,
         elementContext: Unit,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertBinaryExpressionWithDemorgansLawIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertBinaryExpressionWithDemorgansLawIntention.kt
index 046f126efd0a..14d2fe28f76e 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertBinaryExpressionWithDemorgansLawIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertBinaryExpressionWithDemorgansLawIntention.kt
@@ -21,9 +21,9 @@ internal class ConvertBinaryExpressionWithDemorgansLawIntention :
     override fun getFamilyName(): String = KotlinBundle.message("demorgan.law")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtBinaryExpression,
-        elementContext: DemorgansLawUtils.Context,
+      actionContext: ActionContext,
+      element: KtBinaryExpression,
+      elementContext: DemorgansLawUtils.Context,
     ): String = when (element.topmostBinaryExpression().operationToken) {
         KtTokens.ANDAND -> KotlinBundle.message("replace.&&.with.||")
         KtTokens.OROR -> KotlinBundle.message("replace.||.with.&&")
@@ -44,7 +44,7 @@ internal class ConvertBinaryExpressionWithDemorgansLawIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtBinaryExpression,
         elementContext: DemorgansLawUtils.Context,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertConcatenationToBuildStringIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertConcatenationToBuildStringIntention.kt
index dfc269b661a9..fa623d7761f9 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertConcatenationToBuildStringIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertConcatenationToBuildStringIntention.kt
@@ -32,10 +32,10 @@ internal class ConvertConcatenationToBuildStringIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtBinaryExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtBinaryExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         val buildStringCall = convertConcatenationToBuildStringCall(element)
         shortenReferences(buildStringCall)
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertForEachToForLoopIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertForEachToForLoopIntention.kt
index 4374d1b886a0..9e1bb497a373 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertForEachToForLoopIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertForEachToForLoopIntention.kt
@@ -106,10 +106,10 @@ internal class ConvertForEachToForLoopIntention
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallExpression,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallExpression,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         val qualifiedExpression = element.getQualifiedExpressionForSelector()
         val receiverExpression = qualifiedExpression?.receiverExpression
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertLambdaToReferenceIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertLambdaToReferenceIntention.kt
index 8240706045bb..52dfb7de7da8 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertLambdaToReferenceIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertLambdaToReferenceIntention.kt
@@ -40,9 +40,9 @@ internal class ConvertLambdaToReferenceIntention :
     override fun getFamilyName(): String = KotlinBundle.message("convert.lambda.to.reference.before.text")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtLambdaExpression,
-        elementContext: Context,
+      actionContext: ActionContext,
+      element: KtLambdaExpression,
+      elementContext: Context,
     ): String = KotlinBundle.message("convert.lambda.to.reference")
 
     override fun isApplicableByPsi(element: KtLambdaExpression): Boolean {
@@ -136,7 +136,7 @@ internal class ConvertLambdaToReferenceIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtLambdaExpression,
         elementContext: Context,
         updater: ModPsiUpdater,
@@ -153,7 +153,7 @@ internal class ConvertLambdaToReferenceIntention :
         val outerCallExpression = parent.getStrictParentOfType<KtCallExpression>()
         if (outerCallExpression != null) {
             elementContext.renderedTypeArguments?.let {
-                addTypeArguments(outerCallExpression, it, context.project)
+                addTypeArguments(outerCallExpression, it, actionContext.project)
                 outerCallExpression.typeArgumentList?.let(::shortenReferences)
             }
         }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertPropertyGetterToInitializerIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertPropertyGetterToInitializerIntention.kt
index 776ae7095c3d..05cc4f663372 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertPropertyGetterToInitializerIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertPropertyGetterToInitializerIntention.kt
@@ -41,10 +41,10 @@ internal class ConvertPropertyGetterToInitializerIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtPropertyAccessor,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtPropertyAccessor,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         val property = element.parent as? KtProperty ?: return
         val commentSaver = CommentSaver(property)
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertReferenceToLambdaIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertReferenceToLambdaIntention.kt
index ffbcdf2ea6fb..9507cccd4750 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertReferenceToLambdaIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertReferenceToLambdaIntention.kt
@@ -30,10 +30,10 @@ internal class ConvertReferenceToLambdaIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallableReferenceExpression,
-        elementContext: String,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallableReferenceExpression,
+      elementContext: String,
+      updater: ModPsiUpdater,
     ) {
         ConvertReferenceToLambdaUtil.convertReferenceToLambdaExpression(element, elementContext)
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertStringTemplateToBuildStringIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertStringTemplateToBuildStringIntention.kt
index 95c1fa9c6b8e..3e919be4b352 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertStringTemplateToBuildStringIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertStringTemplateToBuildStringIntention.kt
@@ -26,10 +26,10 @@ internal class ConvertStringTemplateToBuildStringIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtStringTemplateExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtStringTemplateExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         val buildStringCall = convertStringTemplateToBuildStringCall(element)
         shortenReferences(buildStringCall)
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToBlockBodyIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToBlockBodyIntention.kt
index 17f74b7283b7..b8f4006a74c9 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToBlockBodyIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToBlockBodyIntention.kt
@@ -26,10 +26,10 @@ internal class ConvertToBlockBodyIntention :
         ConvertToBlockBodyUtils.createContext(element, ShortenReferencesFacility.getInstance(), reformat = true)
 
     override fun invoke(
-        context: ActionContext,
-        element: KtDeclarationWithBody,
-        elementContext: ConvertToBlockBodyContext,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtDeclarationWithBody,
+      elementContext: ConvertToBlockBodyContext,
+      updater: ModPsiUpdater,
     ) {
         ConvertToBlockBodyUtils.convert(element, elementContext)
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt
index 7965afb8ae65..076c86a0ad8c 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt
@@ -36,12 +36,12 @@ internal class ConvertToRawStringTemplateIntention :
         element.descendantsOfType<KtStringTemplateExpression>().all { it.canBeConvertedToStringLiteral() }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtBinaryExpression,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtBinaryExpression,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         val replaced = elementContext.replacement.element?.let { element.replaced(it) } ?: return
-        convertToStringLiteral(replaced, context, updater)
+        convertToStringLiteral(replaced, actionContext, updater)
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt
index 3816c3e4231c..76b653ce6633 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt
@@ -50,10 +50,10 @@ internal class ConvertToStringTemplateIntention :
             null
 
     override fun invoke(
-        context: ActionContext,
-        element: KtBinaryExpression,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtBinaryExpression,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         elementContext.replacement.element?.let { element.replaced(updater.getWritable(it)) }
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/FlattenWhenIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/FlattenWhenIntention.kt
index 44792635ee02..9f48c1a4f219 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/FlattenWhenIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/FlattenWhenIntention.kt
@@ -19,10 +19,10 @@ internal class FlattenWhenIntention : KotlinApplicableModCommandAction<KtWhenExp
         KotlinBundle.message("flatten.when.expression")
 
     override fun invoke(
-        context: ActionContext,
-        element: KtWhenExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtWhenExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         val commentSaver = CommentSaver(element)
         val nestedWhen = element.elseExpression as KtWhenExpression
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/IfToWhenIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/IfToWhenIntention.kt
index 8775baee2e3c..9e227cf772ee 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/IfToWhenIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/IfToWhenIntention.kt
@@ -31,7 +31,12 @@ internal class IfToWhenIntention : KotlinApplicableModCommandAction<KtIfExpressi
     override fun prepareContext(element: KtIfExpression) {
     }
 
-    override fun invoke(context: ActionContext, element: KtIfExpression, elementContext: Unit, updater: ModPsiUpdater) {
+    override fun invoke(
+        actionContext: ActionContext,
+        element: KtIfExpression,
+        elementContext: Unit,
+        updater: ModPsiUpdater,
+    ) {
         val ifExpression = element.topmostIfExpression()
         val parent = ifExpression.parent
 
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportAllMembersIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportAllMembersIntention.kt
index 0de193e35f7d..300a96dbe849 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportAllMembersIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportAllMembersIntention.kt
@@ -42,9 +42,9 @@ internal class ImportAllMembersIntention :
     override fun getFamilyName(): String = KotlinBundle.message("import.members.with")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtExpression,
-        elementContext: Context,
+      actionContext: ActionContext,
+      element: KtExpression,
+      elementContext: Context,
     ): String = KotlinBundle.message("import.members.from.0", elementContext.fqName.asString())
 
     override fun isApplicableByPsi(element: KtExpression): Boolean =
@@ -94,7 +94,7 @@ internal class ImportAllMembersIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtExpression,
         elementContext: Context,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportMemberIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportMemberIntention.kt
index f2b6e926a059..d0402e4806b9 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportMemberIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ImportMemberIntention.kt
@@ -32,9 +32,9 @@ internal class ImportMemberIntention :
     override fun getFamilyName(): String = KotlinBundle.message("add.import.for.member")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtNameReferenceExpression,
-        elementContext: Context,
+      actionContext: ActionContext,
+      element: KtNameReferenceExpression,
+      elementContext: Context,
     ): String = KotlinBundle.message("add.import.for.0", elementContext.fqName.asString())
 
     override fun isApplicableByPsi(element: KtNameReferenceExpression): Boolean =
@@ -48,7 +48,7 @@ internal class ImportMemberIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtNameReferenceExpression,
         elementContext: Context,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InsertExplicitTypeArgumentsIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InsertExplicitTypeArgumentsIntention.kt
index cfc1c380308b..51e1cc15a7b9 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InsertExplicitTypeArgumentsIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InsertExplicitTypeArgumentsIntention.kt
@@ -26,11 +26,11 @@ internal class InsertExplicitTypeArgumentsIntention :
     override fun prepareContext(element: KtCallExpression): String? = getRenderedTypeArguments(element)
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallExpression,
-        elementContext: String,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallExpression,
+      elementContext: String,
+      updater: ModPsiUpdater,
     ) {
-        addTypeArguments(element, elementContext, context.project)
+        addTypeArguments(element, elementContext, actionContext.project)
     }
 }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt
index 2bb6afa3ff7e..d2e4bc8c483c 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt
@@ -84,10 +84,10 @@ internal class InvertIfConditionIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtIfExpression,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtIfExpression,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         val rBrace = parentBlockRBrace(element)
         if (rBrace != null) element.nextEolCommentOnSameLine()?.delete()
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/LambdaToAnonymousFunctionIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/LambdaToAnonymousFunctionIntention.kt
index 5b1dde333c5f..ec9eef6ac984 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/LambdaToAnonymousFunctionIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/LambdaToAnonymousFunctionIntention.kt
@@ -33,9 +33,9 @@ internal class LambdaToAnonymousFunctionIntention :
     override fun getFamilyName(): @IntentionFamilyName String = KotlinBundle.message("convert.lambda.expression.to.anonymous.function")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtLambdaExpression,
-        elementContext: LambdaToFunctionContext,
+      actionContext: ActionContext,
+      element: KtLambdaExpression,
+      elementContext: LambdaToFunctionContext,
     ): String = KotlinBundle.message("convert.to.anonymous.function")
 
     context(KtAnalysisSession)
@@ -68,7 +68,7 @@ internal class LambdaToAnonymousFunctionIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtLambdaExpression,
         elementContext: LambdaToFunctionContext,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/MovePropertyToConstructorIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/MovePropertyToConstructorIntention.kt
index fba7ee3645d7..f0c9bc63a734 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/MovePropertyToConstructorIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/MovePropertyToConstructorIntention.kt
@@ -23,10 +23,10 @@ internal class MovePropertyToConstructorIntention
     override fun prepareContext(element: KtProperty): MovePropertyToConstructorInfo? = MovePropertyToConstructorInfo.create(element)
 
     override fun invoke(
-        context: ActionContext,
-        element: KtProperty,
-        elementContext: MovePropertyToConstructorInfo,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtProperty,
+      elementContext: MovePropertyToConstructorInfo,
+      updater: ModPsiUpdater,
     ) {
         element.moveToConstructor(elementContext.toWritable(updater))
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveAllArgumentNamesIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveAllArgumentNamesIntention.kt
index a0e2458f0402..17b180bc9f52 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveAllArgumentNamesIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveAllArgumentNamesIntention.kt
@@ -42,10 +42,10 @@ internal class RemoveAllArgumentNamesIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallElement,
-        elementContext: ArgumentsDataContext,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallElement,
+      elementContext: ArgumentsDataContext,
+      updater: ModPsiUpdater,
     ) {
         val oldArguments = elementContext.sortedArguments.map { it.element ?: return }
         val varargElement = elementContext.vararg?.let { it.element ?: return }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeArgumentsIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeArgumentsIntention.kt
index 5a86222faab2..6ffbc8cda0ae 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeArgumentsIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeArgumentsIntention.kt
@@ -27,10 +27,10 @@ internal class RemoveExplicitTypeArgumentsIntention :
         areTypeArgumentsRedundant(element).asUnit
 
     override fun invoke(
-        context: ActionContext,
-        element: KtTypeArgumentList,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtTypeArgumentList,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         RemoveExplicitTypeArgumentsUtils.applyTo(element)
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeIntention.kt
index b0366ebc2c83..2787cc17c4c4 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveExplicitTypeIntention.kt
@@ -165,10 +165,10 @@ internal class RemoveExplicitTypeIntention :
     override fun getFamilyName(): String = KotlinBundle.message("remove.explicit.type.specification")
 
     override fun invoke(
-        context: ActionContext,
-        element: KtDeclaration,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtDeclaration,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         element.removeTypeReference()
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt
index 4e867d388fa4..7d8715689cfa 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt
@@ -74,10 +74,10 @@ internal class RemoveSingleArgumentNameIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtValueArgument,
-        elementContext: SingleArgumentContext,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtValueArgument,
+      elementContext: SingleArgumentContext,
+      updater: ModPsiUpdater,
     ) {
         val argumentList = element.parent as? KtValueArgumentList ?: return
 
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt
index c0a343c9d4f4..61e31d3003a7 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt
@@ -56,10 +56,10 @@ internal class ReplaceUnderscoreWithTypeArgumentIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtTypeProjection,
-        elementContext: Context,
-        updater: ModPsiUpdater
+      actionContext: ActionContext,
+      element: KtTypeProjection,
+      elementContext: Context,
+      updater: ModPsiUpdater
     ) {
         val updatedTypeProjection = elementContext.updatedTypeProjection.dereference() ?: return
         val replacedElement = element.replace(updatedTypeProjection) as? KtElement ?: return
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyExplicitLambdaSignatureIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyExplicitLambdaSignatureIntention.kt
index 6042d0fd93a2..2c22e5eeaa82 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyExplicitLambdaSignatureIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyExplicitLambdaSignatureIntention.kt
@@ -26,10 +26,10 @@ internal class SpecifyExplicitLambdaSignatureIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtLambdaExpression,
-        elementContext: String,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtLambdaExpression,
+      elementContext: String,
+      updater: ModPsiUpdater,
     ) {
         specifyExplicitLambdaSignature(element, elementContext)
     }
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyTypeExplicitlyIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyTypeExplicitlyIntention.kt
index f40cb042ac3a..0391a49035ce 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyTypeExplicitlyIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SpecifyTypeExplicitlyIntention.kt
@@ -40,9 +40,9 @@ internal class SpecifyTypeExplicitlyIntention:
     override fun getFamilyName(): String = KotlinBundle.message("specify.type.explicitly")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtCallableDeclaration,
-        elementContext: TypeInfo,
+      actionContext: ActionContext,
+      element: KtCallableDeclaration,
+      elementContext: TypeInfo,
     ): String = when (element) {
         is KtFunction -> KotlinBundle.message("specify.return.type.explicitly")
         else -> KotlinBundle.message("specify.type.explicitly")
@@ -54,7 +54,7 @@ internal class SpecifyTypeExplicitlyIntention:
         else getTypeInfo(element).takeUnless { it.defaultType.isError }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtCallableDeclaration,
         elementContext: TypeInfo,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SplitPropertyDeclarationIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SplitPropertyDeclarationIntention.kt
index 3a0b822dd086..c27d75fb3e8d 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SplitPropertyDeclarationIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/SplitPropertyDeclarationIntention.kt
@@ -42,10 +42,10 @@ internal class SplitPropertyDeclarationIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtProperty,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtProperty,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         val parent = element.parent
 
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ToRawStringLiteralIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ToRawStringLiteralIntention.kt
index cda1c3064b0c..145ded5f500f 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ToRawStringLiteralIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ToRawStringLiteralIntention.kt
@@ -23,12 +23,12 @@ internal class ToRawStringLiteralIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtStringTemplateExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtStringTemplateExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
-        convertToStringLiteral(element, context, updater)
+        convertToStringLiteral(element, actionContext, updater)
     }
 
     override fun isApplicableByPsi(element: KtStringTemplateExpression): Boolean = element.canBeConvertedToStringLiteral()
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/WhenToIfIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/WhenToIfIntention.kt
index e6841cd0e6c0..a6ab041f494b 100644
--- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/WhenToIfIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/WhenToIfIntention.kt
@@ -119,10 +119,10 @@ internal class WhenToIfIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtWhenExpression,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtWhenExpression,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         val subject = element.subjectExpression
         val temporaryNameForWhenSubject =
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/ConvertToForEachFunctionCallIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/ConvertToForEachFunctionCallIntention.kt
index d8dcdf20295e..7f53c9751ad8 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/ConvertToForEachFunctionCallIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/ConvertToForEachFunctionCallIntention.kt
@@ -25,9 +25,9 @@ internal class ConvertToForEachFunctionCallIntention :
     override fun getFamilyName(): String = KotlinBundle.message("replace.with.a.foreach.function.call", "forEach")
 
     override fun getActionName(
-        context: ActionContext,
-        element: KtForExpression,
-        elementContext: Unit,
+      actionContext: ActionContext,
+      element: KtForExpression,
+      elementContext: Unit,
     ): String {
         val callExpression = element.loopRange?.getPossiblyQualifiedCallExpression()
         return KotlinBundle.message(
@@ -68,7 +68,7 @@ internal class ConvertToForEachFunctionCallIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtForExpression,
         elementContext: Unit,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/OperatorToFunctionIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/OperatorToFunctionIntention.kt
index b7d417e9866c..badf8f91cbd2 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/OperatorToFunctionIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/OperatorToFunctionIntention.kt
@@ -124,10 +124,10 @@ internal class OperatorToFunctionIntention :
     override fun getFamilyName(): String = KotlinBundle.message("replace.overloaded.operator.with.function.call")
 
     override fun invoke(
-        context: ActionContext,
-        element: KtExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         OperatorToFunctionConverter.convert(element)
     }
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutCallsOnSeparateLinesIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutCallsOnSeparateLinesIntention.kt
index 5f8028228dba..cb5cb543934f 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutCallsOnSeparateLinesIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutCallsOnSeparateLinesIntention.kt
@@ -52,13 +52,13 @@ internal class PutCallsOnSeparateLinesIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtQualifiedExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtQualifiedExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         val rootQualifierExpression = element.topmostQualifierExpression() ?: return
-        val project = context.project
+        val project = actionContext.project
         val psiFactory = KtPsiFactory(project)
         rootQualifierExpression.visitOperations(transformation = callChainTransformation(element)) { qualifierExpression ->
             val operationReference = qualifierExpression.operationTokenNode as? PsiElement ?: return@visitOperations
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutExpressionsOnSeparateLinesIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutExpressionsOnSeparateLinesIntention.kt
index ffd8ccc85fc7..d8a0552777a0 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutExpressionsOnSeparateLinesIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/PutExpressionsOnSeparateLinesIntention.kt
@@ -35,13 +35,13 @@ internal class PutExpressionsOnSeparateLinesIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtOperationReferenceExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtOperationReferenceExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         val rootBinaryExpression = element.topmostBinaryExpression() ?: return
-        val project = context.project
+        val project = actionContext.project
         val psiFactory = KtPsiFactory(project)
         rootBinaryExpression.visitOperations { operationReference ->
             val whiteSpace = operationReference.nextSibling as? PsiWhiteSpace
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SplitIfIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SplitIfIntention.kt
index 4d37f8ed1f31..c54bedb00a28 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SplitIfIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SplitIfIntention.kt
@@ -26,7 +26,7 @@ internal class SplitIfIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtExpression,
         elementContext: Unit,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldIfToFunctionCallIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldIfToFunctionCallIntention.kt
index db36c172b678..6d754acceb36 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldIfToFunctionCallIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldIfToFunctionCallIntention.kt
@@ -28,10 +28,10 @@ internal class FoldIfToFunctionCallIntention :
     override fun prepareContext(element: KtIfExpression): Context? = getFoldingContext(element)
 
     override fun invoke(
-        context: ActionContext,
-        element: KtIfExpression,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtIfExpression,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         fold(element, elementContext)
     }
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldWhenToFunctionCallIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldWhenToFunctionCallIntention.kt
index e4ee7a2ae114..db470d0ab0e4 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldWhenToFunctionCallIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/FoldWhenToFunctionCallIntention.kt
@@ -28,10 +28,10 @@ internal class FoldWhenToFunctionCallIntention :
     override fun prepareContext(element: KtWhenExpression): Context? = getFoldingContext(element)
 
     override fun invoke(
-        context: ActionContext,
-        element: KtWhenExpression,
-        elementContext: Context,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtWhenExpression,
+      elementContext: Context,
+      updater: ModPsiUpdater,
     ) {
         fold(element, elementContext)
     }
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToIfIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToIfIntention.kt
index 59c985556e73..e55d94986913 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToIfIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToIfIntention.kt
@@ -28,10 +28,10 @@ internal class UnfoldFunctionCallToIfIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         unfold<KtIfExpression>(element)
     }
diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToWhenIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToWhenIntention.kt
index f2c88e61a354..1c23ae83b894 100644
--- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToWhenIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/branchedTransformations/UnfoldFunctionCallToWhenIntention.kt
@@ -28,10 +28,10 @@ internal class UnfoldFunctionCallToWhenIntention :
     }
 
     override fun invoke(
-        context: ActionContext,
-        element: KtCallExpression,
-        elementContext: Unit,
-        updater: ModPsiUpdater,
+      actionContext: ActionContext,
+      element: KtCallExpression,
+      elementContext: Unit,
+      updater: ModPsiUpdater,
     ) {
         unfold<KtWhenExpression>(element)
     }
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddToStringFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddToStringFix.kt
index 2a298295598d..6278cf616637 100644
--- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddToStringFix.kt
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddToStringFix.kt
@@ -31,7 +31,7 @@ class AddToStringFix(
     override fun getFamilyName(): String = KotlinBundle.message("fix.add.tostring.call.family")
 
     override fun getActionName(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtExpression,
         elementContext: ElementContext,
     ): String = KotlinBundle.message(
@@ -39,7 +39,7 @@ class AddToStringFix(
     )
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtExpression,
         elementContext: ElementContext,
         updater: ModPsiUpdater,
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/UseInheritedVisibilityFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/UseInheritedVisibilityFix.kt
index 0f08be196f16..4300f1af7180 100644
--- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/UseInheritedVisibilityFix.kt
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/UseInheritedVisibilityFix.kt
@@ -21,7 +21,7 @@ class UseInheritedVisibilityFix(
     )
 
     override fun invoke(
-        context: ActionContext,
+        actionContext: ActionContext,
         element: KtModifierListOwner,
         elementContext: ElementContext,
         updater: ModPsiUpdater,