diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodFromTrait.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt
similarity index 64%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodFromTrait.kt
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt
index b7b6e2ca918..bc346fc1d41 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodFromTrait.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt
@@ -20,17 +20,17 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiMethod
 import org.jetbrains.jet.lang.psi.JetDeclaration
 import com.intellij.psi.PsiClass
-import org.jetbrains.jet.asJava.KotlinLightMethodFromTrait
+import org.jetbrains.jet.asJava.KotlinLightMethodForTraitFakeOverride
 import com.intellij.psi.PsiElement
 
 
-public class KotlinLightMethodFromTrait(manager: PsiManager,
-                                            override val delegate: PsiMethod,
-                                            override val origin: JetDeclaration,
-                                            containingClass: PsiClass) :
+public class KotlinLightMethodForTraitFakeOverride(manager: PsiManager,
+                                                   override val delegate: PsiMethod,
+                                                   override val origin: JetDeclaration,
+                                                   containingClass: PsiClass) :
         KotlinLightMethodForDeclaration(manager, delegate, origin, containingClass) {
 
     override fun copy(): PsiElement {
-        return KotlinLightMethodFromTrait(getManager()!!, delegate, origin.copy() as JetDeclaration, getContainingClass()!!)
+        return KotlinLightMethodForTraitFakeOverride(getManager()!!, delegate, origin.copy() as JetDeclaration, getContainingClass()!!)
     }
 }
\ No newline at end of file
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
index 378f0a0ccbf..44562a9bbca 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
@@ -134,9 +134,9 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
                 JetDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(method);
 
                 if (declaration != null) {
-                    return !isMethodFromTrait(declaration) ?
+                    return !isTraitFakeOverride(declaration) ?
                            new KotlinLightMethodForDeclaration(myManager, method, declaration, KotlinWrappingLightClass.this) :
-                           new KotlinLightMethodFromTrait(myManager, method, declaration, KotlinWrappingLightClass.this);
+                           new KotlinLightMethodForTraitFakeOverride(myManager, method, declaration, KotlinWrappingLightClass.this);
                 }
 
                 return new LightMethod(myManager, method, KotlinWrappingLightClass.this);
@@ -161,7 +161,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
         return origin == null ? null : origin.getText();
     }
 
-    private boolean isMethodFromTrait(@NotNull JetDeclaration originMethodDeclaration) {
+    private boolean isTraitFakeOverride(@NotNull JetDeclaration originMethodDeclaration) {
         if (!(originMethodDeclaration instanceof JetNamedFunction ||
               originMethodDeclaration instanceof JetPropertyAccessor ||
               originMethodDeclaration instanceof JetProperty)) {
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt
index 6b1018fbb7b..023a161d0ce 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt
@@ -41,7 +41,7 @@ import com.intellij.psi.search.searches.AllOverridingMethodsSearch
 import com.intellij.openapi.util.Pair
 import java.util.HashSet
 import com.intellij.util.Processor
-import org.jetbrains.jet.asJava.KotlinLightMethodFromTrait
+import org.jetbrains.jet.asJava.KotlinLightMethodForTraitFakeOverride
 
 private fun <T> getOverriddenDeclarations(mappingToJava: MutableMap<PsiMethod, T>, classes: Set<PsiClass>): Set<T> {
     val overridden = HashSet<T>()
@@ -50,7 +50,7 @@ private fun <T> getOverriddenDeclarations(mappingToJava: MutableMap<PsiMethod, T
             override fun process(pair: Pair<PsiMethod, PsiMethod>?): Boolean {
                 ProgressManager.checkCanceled()
 
-                if (pair!!.getSecond() !is KotlinLightMethodFromTrait) {
+                if (pair!!.getSecond() !is KotlinLightMethodForTraitFakeOverride) {
                     val superMethod = pair.getFirst()
 
                     val declaration = mappingToJava.get(superMethod)
@@ -80,7 +80,7 @@ public fun getOverriddenMethodTooltip(method: PsiMethod): String? {
 
     val comparator = MethodCellRenderer(false).getComparator()
 
-    val overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodFromTrait } sortBy(comparator)
+    val overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodForTraitFakeOverride } sortBy(comparator)
     if (overridingJavaMethods.isEmpty()) return null
 
     val start = if (isAbstract) DaemonBundle.message("method.is.implemented.header") else DaemonBundle.message("method.is.overriden.header")
@@ -103,7 +103,7 @@ public fun navigateToOverriddenMethod(e: MouseEvent?, method: PsiMethod) {
         return
     }
 
-    var overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodFromTrait }
+    var overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodForTraitFakeOverride }
     if (overridingJavaMethods.isEmpty()) return
 
     val showMethodNames = !PsiUtil.allMethodsHaveSameSignature(overridingJavaMethods.copyToArray())