diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index 99e7641c78b..671d8652f16 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -69,16 +69,16 @@ public class GenerationState @JvmOverloads constructor(
         public val progress: Progress = Progress.DEAF
 ) {
     public abstract class GenerateClassFilter {
-        public abstract fun shouldAnnotateClass(classOrObject: KtClassOrObject): Boolean
-        public abstract fun shouldGenerateClass(classOrObject: KtClassOrObject): Boolean
+        public abstract fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject): Boolean
+        public abstract fun shouldGenerateClass(processingClassOrObject: KtClassOrObject): Boolean
         public abstract fun shouldGeneratePackagePart(jetFile: KtFile): Boolean
         public abstract fun shouldGenerateScript(script: KtScript): Boolean
 
         companion object {
             public val GENERATE_ALL: GenerateClassFilter = object : GenerateClassFilter() {
-                override fun shouldAnnotateClass(classOrObject: KtClassOrObject): Boolean = true
+                override fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject): Boolean = true
 
-                override fun shouldGenerateClass(classOrObject: KtClassOrObject): Boolean = true
+                override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject): Boolean = true
 
                 override fun shouldGenerateScript(script: KtScript): Boolean = true
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt
index 4d7f2e09bb9..064d5690c86 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt
@@ -240,18 +240,19 @@ class LightClassDataProviderForClassOrObject(private val classOrObject: KtClassO
                 return true
             }
 
-            override fun shouldAnnotateClass(classOrObject: KtClassOrObject): Boolean {
-                return shouldGenerateClass(classOrObject)
+            override fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject): Boolean {
+                return shouldGenerateClass(processingClassOrObject)
             }
 
-            override fun shouldGenerateClass(classOrObject: KtClassOrObject): Boolean {
+            override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject): Boolean {
                 // Trivial: generate and analyze class we are interested in.
-                if (classOrObject === classOrObject) return true
+                if (classOrObject === processingClassOrObject) return true
 
                 // Process all parent classes as they are context for current class
                 // Process child classes because they probably affect members (heuristic)
 
-                if (PsiTreeUtil.isAncestor(classOrObject, classOrObject, true) || PsiTreeUtil.isAncestor(classOrObject, classOrObject, true)) {
+                if (PsiTreeUtil.isAncestor(classOrObject, processingClassOrObject, true) ||
+                    PsiTreeUtil.isAncestor(processingClassOrObject, classOrObject, true)) {
                     return true
                 }
 
@@ -269,8 +270,8 @@ class LightClassDataProviderForClassOrObject(private val classOrObject: KtClassO
                 // TODO: current method will process local classes in irrelevant declarations, it should be fixed.
                 // We generate all enclosing classes
 
-                if (classOrObject.isLocal() && classOrObject.isLocal()) {
-                    val commonParent = PsiTreeUtil.findCommonParent(classOrObject, classOrObject)
+                if (classOrObject.isLocal() && processingClassOrObject.isLocal()) {
+                    val commonParent = PsiTreeUtil.findCommonParent(classOrObject, processingClassOrObject)
                     return commonParent != null && commonParent !is PsiFile
                 }
 
@@ -320,12 +321,12 @@ class LightClassDataProviderForFileFacade(
 
     override val generateClassFilter: GenerationState.GenerateClassFilter
         get() = object : GenerationState.GenerateClassFilter() {
-            override fun shouldAnnotateClass(classOrObject: KtClassOrObject): Boolean {
-                return shouldGenerateClass(classOrObject)
+            override fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject): Boolean {
+                return shouldGenerateClass(processingClassOrObject)
             }
 
-            override fun shouldGenerateClass(classOrObject: KtClassOrObject): Boolean {
-                return KtPsiUtil.isLocal(classOrObject)
+            override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject): Boolean {
+                return KtPsiUtil.isLocal(processingClassOrObject)
             }
 
             override fun shouldGeneratePackagePart(jetFile: KtFile): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
index 7af1d3c452a..cd2ead79e3e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -364,8 +364,8 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour
 
                 val generateClassFilter = object : GenerationState.GenerateClassFilter() {
                     override fun shouldGeneratePackagePart(jetFile: KtFile) = jetFile == jetFile
-                    override fun shouldAnnotateClass(classOrObject: KtClassOrObject) = true
-                    override fun shouldGenerateClass(classOrObject: KtClassOrObject) = classOrObject.getContainingKtFile() == jetFile
+                    override fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject) = true
+                    override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject) = processingClassOrObject.getContainingKtFile() == jetFile
                     override fun shouldGenerateScript(script: KtScript) = false
                 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
index e0ab57417e6..ea41eb465af 100644
--- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
+++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
@@ -212,13 +212,13 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
                 }
 
                 @Override
-                public boolean shouldAnnotateClass(@NotNull KtClassOrObject classOrObject) {
+                public boolean shouldAnnotateClass(@NotNull KtClassOrObject processingClassOrObject) {
                     return true;
                 }
 
                 @Override
-                public boolean shouldGenerateClass(@NotNull KtClassOrObject classOrObject) {
-                    return classOrObject.getContainingKtFile() == jetFile;
+                public boolean shouldGenerateClass(@NotNull KtClassOrObject processingClassOrObject) {
+                    return processingClassOrObject.getContainingKtFile() == jetFile;
                 }
 
                 @Override