diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt
index 43c26470378..2a10bdc2bce 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt
@@ -30,7 +30,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
     protected constructor(node: ASTNode) : super(node)
     protected constructor(stub: KotlinPlaceHolderStub<T>, nodeType: JetPlaceHolderStubElementType<T>) : super(stub, nodeType)
 
-    public abstract fun getClassOrObject(): JetClassOrObject
+    public abstract fun getContainingClassOrObject(): JetClassOrObject
 
     override fun isLocal() = false
 
@@ -65,7 +65,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
 
     override fun getTypeParameters() = emptyList<JetTypeParameter>()
 
-    override fun getName(): String = getClassOrObject().getName()!!
+    override fun getName(): String = getContainingClassOrObject().getName()!!
 
     override fun getNameAsSafeName() = Name.identifier(getName())
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.kt
index 1612da84e73..f256c1674d8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.kt
@@ -29,9 +29,7 @@ public class JetPrimaryConstructor : JetConstructor<JetPrimaryConstructor> {
 
     override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D) = visitor.visitPrimaryConstructor(this, data)
 
-    public fun getContainingClassOrObject(): JetClassOrObject = getParent() as JetClassOrObject
-
-    override fun getClassOrObject() = getContainingClassOrObject()
+    override fun getContainingClassOrObject() = getParent() as JetClassOrObject
 
     override fun addModifier(modifier: JetModifierKeywordToken) {
         val modifierList = getModifierList()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.kt
index 660054a67f7..857da6d1f65 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.kt
@@ -27,7 +27,7 @@ public class JetSecondaryConstructor : JetConstructor<JetSecondaryConstructor> {
 
     override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D) = visitor.visitSecondaryConstructor(this, data)
 
-    override fun getClassOrObject() = getParent().getParent() as JetClassOrObject
+    override fun getContainingClassOrObject() = getParent().getParent() as JetClassOrObject
 
     override fun getBodyExpression() = findChildByClass(javaClass<JetBlockExpression>())
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java
index 14e0e2951cc..cc651b6b51a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java
@@ -203,7 +203,7 @@ public class OverloadResolver {
             }
             else {
                 String containingClassName = jetDeclaration instanceof JetSecondaryConstructor ?
-                                               ((JetSecondaryConstructor) jetDeclaration).getClassOrObject().getName() : null;
+                                               ((JetSecondaryConstructor) jetDeclaration).getContainingClassOrObject().getName() : null;
 
                 trace.report(Errors.CONFLICTING_OVERLOADS.on(
                         jetDeclaration, memberDescriptor,
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
index 8c16bc8368c..05ae2941ff2 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
@@ -248,7 +248,7 @@ public class LightClassUtil {
         }
 
         if (declaration instanceof JetConstructor) {
-            return getPsiClass(((JetConstructor) declaration).getClassOrObject());
+            return getPsiClass(((JetConstructor) declaration).getContainingClassOrObject());
         }
 
         //noinspection unchecked
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocFinder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocFinder.kt
index 6b9020dc6b7..3276ca80f61 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocFinder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocFinder.kt
@@ -31,7 +31,7 @@ object KDocFinder {
             var psiDeclaration = (declaration.getSource() as? PsiSourceElement)?.psi?.getNavigationElement()
             // KDoc for primary constructor is located inside of its class KDoc
             if (psiDeclaration is JetPrimaryConstructor) {
-                psiDeclaration = psiDeclaration.getClassOrObject()
+                psiDeclaration = psiDeclaration.getContainingClassOrObject()
             }
 
             if (psiDeclaration is JetDeclaration) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
index 1c8bbe8c31b..7e65953d168 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
@@ -104,7 +104,7 @@ private fun PsiElement.isConstructorOf(unwrappedCandidate: PsiElement) =
     // call to Java constructor
     (this is PsiMethod && isConstructor() && getContainingClass() == unwrappedCandidate) ||
     // call to Kotlin constructor
-    (this is JetConstructor<*> && getClassOrObject() == unwrappedCandidate)
+    (this is JetConstructor<*> && getContainingClassOrObject() == unwrappedCandidate)
 
 fun AbstractJetReference<out JetExpression>.renameImplicitConventionalCall(newName: String?): JetExpression {
     if (newName == null) return expression
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
index 1d39a571224..348c47b96f8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
@@ -88,7 +88,7 @@ fun PsiReference.isConstructorUsage(jetClassOrObject: JetClassOrObject): Boolean
         if (descriptor !is ConstructorDescriptor) return false
 
         val declaration = DescriptorToSourceUtils.descriptorToDeclaration(descriptor.getContainingDeclaration())
-        return declaration == jetClassOrObject || (declaration is JetConstructor<*> && declaration.getClassOrObject() == jetClassOrObject)
+        return declaration == jetClassOrObject || (declaration is JetConstructor<*> && declaration.getContainingClassOrObject() == jetClassOrObject)
     }
 
     checkJavaUsage() || checkKotlinUsage()
@@ -120,7 +120,7 @@ public fun PsiElement.processDelegationCallConstructorUsages(scope: SearchScope,
 private fun PsiElement.processDelegationCallKotlinConstructorUsages(scope: SearchScope, process: (JetConstructorDelegationCall) -> Unit) {
     val element = unwrapped
     val klass = when (element) {
-        is JetConstructor<*> -> element.getClassOrObject()
+        is JetConstructor<*> -> element.getContainingClassOrObject()
         is JetClass -> element
         else -> return
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java
index 3f82ef302c7..95bcf5a79be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java
@@ -61,7 +61,7 @@ public class JetFunctionPresenter implements ItemPresentationProvider<JetFunctio
             @Override
             public String getLocationString() {
                 if (function instanceof JetConstructor) {
-                    FqName name = ((JetConstructor) function).getClassOrObject().getFqName();
+                    FqName name = ((JetConstructor) function).getContainingClassOrObject().getFqName();
                     return name != null ? String.format("(in %s)", name) : "";
                 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java
index 6b84f3b8811..93a405f1cf3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java
@@ -54,7 +54,7 @@ public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<Jet
         if (reference != null) {
             PsiElement target = reference.resolve();
             if (target instanceof JetSecondaryConstructor) {
-                target = ((JetSecondaryConstructor) target).getClassOrObject();
+                target = ((JetSecondaryConstructor) target).getContainingClassOrObject();
             }
             if (target instanceof JetClass && QuickFixUtil.canModifyElement(target)) {
                 classDeclaration = (JetClass) target;
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
index ad0a6302b94..8525091469d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
@@ -62,7 +62,7 @@ public class InsertDelegationCallQuickfix(val isThis: Boolean, element: JetSecon
     object InsertThisDelegationCallFactory : JetSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) = diagnostic.createIntentionForFirstParentOfType<JetSecondaryConstructor> {
             secondaryConstructor ->
-            if (secondaryConstructor.getClassOrObject().getConstructorsCount() <= 1 ||
+            if (secondaryConstructor.getContainingClassOrObject().getConstructorsCount() <= 1 ||
                 !secondaryConstructor.hasImplicitDelegationCall()) return null
 
             return InsertDelegationCallQuickfix(isThis = true, element = secondaryConstructor)
@@ -75,7 +75,7 @@ public class InsertDelegationCallQuickfix(val isThis: Boolean, element: JetSecon
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val secondaryConstructor = diagnostic.getPsiElement().getNonStrictParentOfType<JetSecondaryConstructor>() ?: return null
             if (!secondaryConstructor.hasImplicitDelegationCall()) return null
-            val klass = secondaryConstructor.getClassOrObject() as? JetClass ?: return null
+            val klass = secondaryConstructor.getContainingClassOrObject() as? JetClass ?: return null
             if (klass.hasPrimaryConstructor()) return null
 
             return InsertDelegationCallQuickfix(isThis = false, element = secondaryConstructor)