diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index a3dd306f0ca..11016d45914 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -1264,8 +1264,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                     initializer.accept(visitor);
                 }
             }
-            else if (declaration instanceof KtClassInitializer) {
-                KtClassInitializer initializer = (KtClassInitializer) declaration;
+            else if (declaration instanceof KtAnonymousInitializer) {
+                KtAnonymousInitializer initializer = (KtAnonymousInitializer) declaration;
                 initializer.accept(visitor);
             }
             else if (declaration instanceof KtSecondaryConstructor) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index b3ab185647d..f054b59f966 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -365,8 +365,8 @@ public abstract class MemberCodegen<T extends KtElement/* TODO: & JetDeclaration
                     initializeProperty(codegen.invoke(), (KtProperty) declaration);
                 }
             }
-            else if (declaration instanceof KtClassInitializer) {
-                KtExpression body = ((KtClassInitializer) declaration).getBody();
+            else if (declaration instanceof KtAnonymousInitializer) {
+                KtExpression body = ((KtAnonymousInitializer) declaration).getBody();
                 if (body != null) {
                     codegen.invoke().gen(body, Type.VOID_TYPE);
                 }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
index bac4fa94f6a..81489610ed6 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.ScriptDescriptor;
-import org.jetbrains.kotlin.psi.KtClassInitializer;
+import org.jetbrains.kotlin.psi.KtAnonymousInitializer;
 import org.jetbrains.kotlin.psi.KtDeclaration;
 import org.jetbrains.kotlin.psi.KtExpression;
 import org.jetbrains.kotlin.psi.KtScript;
@@ -52,8 +52,8 @@ public class ScriptContext extends ClassContext {
         KtScript script = (KtScript) DescriptorToSourceUtils.getSourceFromDescriptor(scriptDescriptor);
         assert script != null : "Declaration should be present for script: " + scriptDescriptor;
         KtDeclaration lastDeclaration = CollectionsKt.lastOrNull(script.getDeclarations());
-        if (lastDeclaration instanceof KtClassInitializer) {
-            this.lastStatement = ((KtClassInitializer) lastDeclaration).getBody();
+        if (lastDeclaration instanceof KtAnonymousInitializer) {
+            this.lastStatement = ((KtAnonymousInitializer) lastDeclaration).getBody();
         }
         else {
             this.lastStatement = null;
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
index c846dd13a8c..b68d4ed84d3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
@@ -1343,7 +1343,7 @@ public class JetControlFlowProcessor {
         }
 
         @Override
-        public void visitAnonymousInitializer(@NotNull KtClassInitializer classInitializer) {
+        public void visitAnonymousInitializer(@NotNull KtAnonymousInitializer classInitializer) {
             generateInstructions(classInitializer.getBody());
         }
 
@@ -1355,7 +1355,7 @@ public class JetControlFlowProcessor {
 
         private void generateInitializersForScriptClassOrObject(@NotNull KtDeclarationContainer classOrObject) {
             for (KtDeclaration declaration : classOrObject.getDeclarations()) {
-                if (declaration instanceof KtProperty || declaration instanceof KtClassInitializer) {
+                if (declaration instanceof KtProperty || declaration instanceof KtAnonymousInitializer) {
                     generateInstructions(declaration);
                 }
             }
@@ -1384,7 +1384,7 @@ public class JetControlFlowProcessor {
                 for (KtDeclaration declaration : classOrObject.getDeclarations()) {
                     if (declaration instanceof KtSecondaryConstructor ||
                         declaration instanceof KtProperty ||
-                        declaration instanceof KtClassInitializer) {
+                        declaration instanceof KtAnonymousInitializer) {
                         continue;
                     }
                     generateInstructions(declaration);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
index c6c5cd8b83b..63dafef84b9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
@@ -760,7 +760,7 @@ public class JetFlowInformationProvider {
                         //noinspection unchecked
                         KtExpression parent = PsiTreeUtil.getParentOfType(
                                 element,
-                                KtTryExpression.class, KtFunction.class, KtClassInitializer.class
+                                KtTryExpression.class, KtFunction.class, KtAnonymousInitializer.class
                         );
 
                         if (parent instanceof KtTryExpression) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 6679d5afb04..7ca229a7a54 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -716,7 +716,7 @@ public interface Errors {
     DiagnosticFactory0<KtDeclarationWithBody>
             NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY = DiagnosticFactory0.create(ERROR, DECLARATION_WITH_BODY);
 
-    DiagnosticFactory0<KtClassInitializer> ANONYMOUS_INITIALIZER_IN_INTERFACE = DiagnosticFactory0.create(ERROR);
+    DiagnosticFactory0<KtAnonymousInitializer> ANONYMOUS_INITIALIZER_IN_INTERFACE = DiagnosticFactory0.create(ERROR);
 
     DiagnosticFactory0<KtThisExpression> NO_THIS = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<KtRootPackageExpression> PACKAGE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
index f4f21aac76d..5397f0f2aa1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
@@ -267,7 +267,7 @@ public object PositioningStrategies {
             val elementToMark = when (element) {
                 is KtObjectDeclaration -> element.getObjectKeyword()
                 is KtPropertyAccessor -> element.getNamePlaceholder()
-                is KtClassInitializer -> element
+                is KtAnonymousInitializer -> element
                 else -> throw IllegalArgumentException(
                         "Can't find text range for element '${element.javaClass.getCanonicalName()}' with the text '${element.getText()}'")
             }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt
index e816c7ba65f..2226ccaf72d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt
@@ -183,7 +183,7 @@ private object DebugTextBuildingVisitor : KtVisitor<String, Unit>() {
         return renderChildren(nullableType, "", "", "?")
     }
 
-    override fun visitAnonymousInitializer(initializer: KtClassInitializer, data: Unit?): String? {
+    override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer, data: Unit?): String? {
         val containingDeclaration = KtStubbedPsiUtil.getContainingDeclaration(initializer)
         return "initializer in " + (containingDeclaration?.getDebugText() ?: "...")
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassInitializer.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnonymousInitializer.java
similarity index 88%
rename from compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassInitializer.java
rename to compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnonymousInitializer.java
index 37350560d3c..9a4d45c8ded 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassInitializer.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnonymousInitializer.java
@@ -25,12 +25,12 @@ import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub;
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes;
 
-public class KtClassInitializer extends KtDeclarationStub<KotlinPlaceHolderStub<KtClassInitializer>> implements KtStatementExpression {
-    public KtClassInitializer(@NotNull ASTNode node) {
+public class KtAnonymousInitializer extends KtDeclarationStub<KotlinPlaceHolderStub<KtAnonymousInitializer>> implements KtStatementExpression {
+    public KtAnonymousInitializer(@NotNull ASTNode node) {
         super(node);
     }
 
-    public KtClassInitializer(@NotNull KotlinPlaceHolderStub<KtClassInitializer> stub) {
+    public KtAnonymousInitializer(@NotNull KotlinPlaceHolderStub<KtAnonymousInitializer> stub) {
         super(stub, KtStubElementTypes.ANONYMOUS_INITIALIZER);
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassBody.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassBody.kt
index 72b6d2f1f6a..b7d15e82975 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassBody.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassBody.kt
@@ -37,7 +37,7 @@ class KtClassBody : KtElementImplStub<KotlinPlaceHolderStub<KtClassBody>>, KtDec
 
     override fun <R, D> accept(visitor: KtVisitor<R, D>, data: D) = visitor.visitClassBody(this, data)
 
-    val anonymousInitializers: List<KtClassInitializer>
+    val anonymousInitializers: List<KtAnonymousInitializer>
         get() = findChildrenByType(KtNodeTypes.ANONYMOUS_INITIALIZER)
 
     internal val secondaryConstructors: List<KtSecondaryConstructor>
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt
index b4165e21e03..5ba03ed53d3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt
@@ -61,7 +61,7 @@ abstract public class KtClassOrObject :
         }
     }
 
-    public fun getAnonymousInitializers(): List<KtClassInitializer> = getBody()?.anonymousInitializers.orEmpty()
+    public fun getAnonymousInitializers(): List<KtAnonymousInitializer> = getBody()?.anonymousInitializers.orEmpty()
 
     public fun getBody(): KtClassBody? = getStubOrPsiChild(KtStubElementTypes.CLASS_BODY)
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
index dd33a747020..50d6a8e82cb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
@@ -243,7 +243,7 @@ public class KtPsiFactory(private val project: Project) {
         return createFunction("fun foo() {}").getBodyExpression() as KtBlockExpression
     }
 
-    public fun createAnonymousInitializer(): KtClassInitializer {
+    public fun createAnonymousInitializer(): KtAnonymousInitializer {
         return createClass("class A { init {} }").getAnonymousInitializers().first()
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
index cec631b5c95..0f7141b4d4c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
@@ -755,8 +755,8 @@ public class KtPsiUtil {
         while (current != null) {
             PsiElement parent = PsiTreeUtil.getStubOrPsiParent(current);
             if (parent instanceof KtScript) return null;
-            if (current instanceof KtClassInitializer) {
-                return ((KtClassInitializer) current).getBody();
+            if (current instanceof KtAnonymousInitializer) {
+                return ((KtAnonymousInitializer) current).getBody();
             }
             if (current instanceof KtProperty || current instanceof KtFunction) {
                 if (parent instanceof KtFile) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java
index a831205e8f1..e9ce237df49 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java
@@ -338,7 +338,7 @@ public class KtVisitor<R, D> extends PsiElementVisitor {
         return visitKtElement(list, data);
     }
 
-    public R visitAnonymousInitializer(@NotNull KtClassInitializer initializer, D data) {
+    public R visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer, D data) {
         return visitDeclaration(initializer, data);
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java
index af55eeeec9d..cb0f926293d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java
@@ -325,7 +325,7 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
         super.visitInitializerList(list, null);
     }
 
-    public void visitAnonymousInitializer(@NotNull KtClassInitializer initializer) {
+    public void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer) {
         super.visitAnonymousInitializer(initializer, null);
     }
 
@@ -889,7 +889,7 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
     }
 
     @Override
-    public final Void visitAnonymousInitializer(@NotNull KtClassInitializer initializer, Void data) {
+    public final Void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer, Void data) {
         visitAnonymousInitializer(initializer);
         return null;
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java
index 29bd2c594e0..8524b845ca3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java
@@ -322,7 +322,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
         super.visitInitializerList(list, data);
     }
 
-    public void visitAnonymousInitializerVoid(@NotNull KtClassInitializer initializer, P data) {
+    public void visitAnonymousInitializerVoid(@NotNull KtAnonymousInitializer initializer, P data) {
         super.visitAnonymousInitializer(initializer, data);
     }
 
@@ -864,7 +864,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
     }
 
     @Override
-    public final Void visitAnonymousInitializer(@NotNull KtClassInitializer initializer, P data) {
+    public final Void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer, P data) {
         visitAnonymousInitializerVoid(initializer, data);
     	return null;
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java
index bb1a722ea2d..001819ccc8d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java
@@ -31,8 +31,8 @@ public interface KtStubElementTypes {
 
     KtClassElementType ENUM_ENTRY = new KtClassElementType("ENUM_ENTRY");
     KtObjectElementType OBJECT_DECLARATION = new KtObjectElementType("OBJECT_DECLARATION");
-    KtPlaceHolderStubElementType<KtClassInitializer> ANONYMOUS_INITIALIZER =
-            new KtPlaceHolderStubElementType<KtClassInitializer>("ANONYMOUS_INITIALIZER", KtClassInitializer.class);
+    KtPlaceHolderStubElementType<KtAnonymousInitializer> ANONYMOUS_INITIALIZER =
+            new KtPlaceHolderStubElementType<KtAnonymousInitializer>("ANONYMOUS_INITIALIZER", KtAnonymousInitializer.class);
     KtPlaceHolderStubElementType<KtSecondaryConstructor> SECONDARY_CONSTRUCTOR =
             new KtPlaceHolderStubElementType<KtSecondaryConstructor>("SECONDARY_CONSTRUCTOR", KtSecondaryConstructor.class);
     KtPlaceHolderStubElementType<KtPrimaryConstructor> PRIMARY_CONSTRUCTOR =
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
index 8a125e4d598..19417aba95a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
@@ -202,7 +202,7 @@ public class AnnotationChecker(private val additionalCheckers: Iterable<Addition
                 is KtTypeParameter -> TargetLists.T_TYPE_PARAMETER
                 is KtTypeProjection ->
                     if (annotated.projectionKind == KtProjectionKind.STAR) TargetLists.T_STAR_PROJECTION else TargetLists.T_TYPE_PROJECTION
-                is KtClassInitializer -> TargetLists.T_INITIALIZER
+                is KtAnonymousInitializer -> TargetLists.T_INITIALIZER
                 is KtMultiDeclaration -> TargetLists.T_MULTI_DECLARATION
                 is KtFunctionLiteralExpression -> TargetLists.T_FUNCTION_LITERAL
                 is KtObjectLiteralExpression -> TargetLists.T_OBJECT_LITERAL
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java
index b34d954c45f..df05bacbac8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java
@@ -39,7 +39,7 @@ public interface BodiesResolveContext {
     @Mutable
     Map<KtClassOrObject, ClassDescriptorWithResolutionScopes> getDeclaredClasses();
     @Mutable
-    Map<KtClassInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers();
+    Map<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers();
     @Mutable
     Map<KtSecondaryConstructor, ConstructorDescriptor> getSecondaryConstructors();
     @Mutable
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
index 86ff9a6c0b6..9cb54a160db 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
@@ -500,8 +500,8 @@ public class BodyResolver {
     }
 
     private void resolveAnonymousInitializers(@NotNull BodiesResolveContext c) {
-        for (Map.Entry<KtClassInitializer, ClassDescriptorWithResolutionScopes> entry : c.getAnonymousInitializers().entrySet()) {
-            KtClassInitializer initializer = entry.getKey();
+        for (Map.Entry<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> entry : c.getAnonymousInitializers().entrySet()) {
+            KtAnonymousInitializer initializer = entry.getKey();
             ClassDescriptorWithResolutionScopes descriptor = entry.getValue();
             resolveAnonymousInitializer(c.getOuterDataFlowInfo(), initializer, descriptor);
         }
@@ -509,7 +509,7 @@ public class BodyResolver {
 
     public void resolveAnonymousInitializer(
             @NotNull DataFlowInfo outerDataFlowInfo,
-            @NotNull KtClassInitializer anonymousInitializer,
+            @NotNull KtAnonymousInitializer anonymousInitializer,
             @NotNull ClassDescriptorWithResolutionScopes classDescriptor
     ) {
         LexicalScope scopeForInitializers = classDescriptor.getScopeForInitializerResolution();
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
index 799ff909568..8db2c16656c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
@@ -154,7 +154,7 @@ public class LazyTopDownAnalyzer(
                     visitClassOrObject(declaration)
                 }
 
-                override fun visitAnonymousInitializer(initializer: KtClassInitializer) {
+                override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer) {
                     val containerDescriptor = lazyDeclarationResolver.resolveToDescriptor(initializer.containingDeclaration) as ClassDescriptorWithResolutionScopes
                     c.getAnonymousInitializers().put(initializer, containerDescriptor)
                 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
index 258ed6c216a..7e2a24200c6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
@@ -38,7 +38,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
     private final DataFlowInfo outerDataFlowInfo;
 
     private final Map<KtClassOrObject, ClassDescriptorWithResolutionScopes> classes = Maps.newLinkedHashMap();
-    private final Map<KtClassInitializer, ClassDescriptorWithResolutionScopes> anonymousInitializers = Maps.newLinkedHashMap();
+    private final Map<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> anonymousInitializers = Maps.newLinkedHashMap();
     private final Set<KtFile> files = new LinkedHashSet<KtFile>();
     private final Map<KtSecondaryConstructor, ConstructorDescriptor> secondaryConstructors = Maps.newLinkedHashMap();
 
@@ -95,7 +95,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
     }
 
     @Override
-    public Map<KtClassInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers() {
+    public Map<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers() {
         return anonymousInitializers;
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java
index 743148377d0..a52959bb6b7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java
@@ -62,7 +62,7 @@ public class DeclarationScopeProviderImpl implements DeclarationScopeProvider {
         if (parentDeclaration instanceof KtClassOrObject) {
             KtClassOrObject classOrObject = (KtClassOrObject) parentDeclaration;
             LazyClassDescriptor classDescriptor = (LazyClassDescriptor) lazyDeclarationResolver.getClassDescriptor(classOrObject, NoLookupLocation.WHEN_GET_DECLARATION_SCOPE);
-            if (ktDeclaration instanceof KtClassInitializer || ktDeclaration instanceof KtProperty) {
+            if (ktDeclaration instanceof KtAnonymousInitializer || ktDeclaration instanceof KtProperty) {
                 return classDescriptor.getScopeForInitializerResolution();
             }
             if (ktDeclaration instanceof KtObjectDeclaration
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt
index aba2b8ca67e..96d1a78a27d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt
@@ -38,7 +38,7 @@ public abstract class AbstractPsiBasedDeclarationProvider(storageManager: Storag
         val classesAndObjects = ArrayListMultimap.create<Name, JetClassLikeInfo>() // order matters here
 
         public fun putToIndex(declaration: KtDeclaration) {
-            if (declaration is KtClassInitializer || declaration is KtSecondaryConstructor) return
+            if (declaration is KtAnonymousInitializer || declaration is KtSecondaryConstructor) return
 
             allDeclarations.add(declaration)
             if (declaration is KtNamedFunction) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/AssignedVariablesSearcher.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/AssignedVariablesSearcher.kt
index 920db4a1527..ea728096140 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/AssignedVariablesSearcher.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/AssignedVariablesSearcher.kt
@@ -38,7 +38,7 @@ abstract class AssignedVariablesSearcher: KtTreeVisitorVoid() {
         if (declaration is KtDeclarationWithBody || declaration is KtClassOrObject) {
             currentDeclaration = declaration
         }
-        else if (declaration is KtClassInitializer) {
+        else if (declaration is KtAnonymousInitializer) {
             // Go to class declaration: init -> body -> class
             currentDeclaration = declaration.parent.parent as KtDeclaration
         }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
index 6c78ed2ee18..76fbe3d56d1 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
@@ -93,7 +93,7 @@ public open class KtLightClassForExplicitDeclaration(
                 KtNamedFunction::class.java,
                 KtConstructor::class.java,
                 KtProperty::class.java,
-                KtClassInitializer::class.java,
+                KtAnonymousInitializer::class.java,
                 KtParameter::class.java)
 
         if (declaration is KtParameter) {
@@ -109,7 +109,7 @@ public open class KtLightClassForExplicitDeclaration(
             return getParentByPsiMethod(LightClassUtil.getLightClassPropertyMethods(declaration).getter, declaration.name, true)
         }
 
-        if (declaration is KtClassInitializer) {
+        if (declaration is KtAnonymousInitializer) {
             val parent = declaration.parent
             val grandparent = parent.parent
 
diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
index 3310c786bfa..cfeb903e750 100644
--- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
@@ -108,7 +108,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
                 accessor.acceptChildren(this)
             }
 
-            override fun visitAnonymousInitializer(initializer: KtClassInitializer) {
+            override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer) {
                 initializer.acceptChildren(this)
             }
 
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
index de357285f7a..bfc72818e31 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
@@ -551,7 +551,7 @@ class PartialBodyResolveFilter(
                         true
                 }
 
-                is KtClassInitializer -> false
+                is KtAnonymousInitializer -> false
 
                 else -> true
             }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
index d7a734274a5..d8f1ce21bd7 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
@@ -111,7 +111,7 @@ internal class PerFileAnalysisCache(val file: KtFile, val componentProvider: Com
 private object KotlinResolveDataProvider {
     private val topmostElementTypes = arrayOf<Class<out PsiElement?>?>(
             javaClass<KtNamedFunction>(),
-            javaClass<KtClassInitializer>(),
+            javaClass<KtAnonymousInitializer>(),
             javaClass<KtProperty>(),
             javaClass<KtImportDirective>(),
             javaClass<KtPackageDirective>(),
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
index 8e4c68c3428..17584753df4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
@@ -193,7 +193,7 @@ public class ResolveElementCache(
         }
 
         val declaration = contextElement.getParentOfType<KtDeclaration>(false)
-        if (declaration != null && declaration !is KtClassInitializer) {
+        if (declaration != null && declaration !is KtAnonymousInitializer) {
             // Activate descriptor resolution
             resolveSession.resolveToDescriptor(declaration)
         }
@@ -205,7 +205,7 @@ public class ResolveElementCache(
         val elementOfAdditionalResolve = KtPsiUtil.getTopmostParentOfTypes(
                 element,
                 javaClass<KtNamedFunction>(),
-                javaClass<KtClassInitializer>(),
+                javaClass<KtAnonymousInitializer>(),
                 javaClass<KtSecondaryConstructor>(),
                 javaClass<KtProperty>(),
                 javaClass<KtParameter>(),
@@ -263,7 +263,7 @@ public class ResolveElementCache(
         val trace: BindingTrace = when (resolveElement) {
             is KtNamedFunction -> functionAdditionalResolve(resolveSession, resolveElement, file, createStatementFilter())
 
-            is KtClassInitializer -> initializerAdditionalResolve(resolveSession, resolveElement, file, createStatementFilter())
+            is KtAnonymousInitializer -> initializerAdditionalResolve(resolveSession, resolveElement, file, createStatementFilter())
 
             is KtSecondaryConstructor -> secondaryConstructorAdditionalResolve(resolveSession, resolveElement, file, createStatementFilter())
 
@@ -489,15 +489,15 @@ public class ResolveElementCache(
         return trace
     }
 
-    private fun initializerAdditionalResolve(resolveSession: ResolveSession, classInitializer: KtClassInitializer, file: KtFile, statementFilter: StatementFilter): BindingTrace {
-        val trace = createDelegatingTrace(classInitializer)
+    private fun initializerAdditionalResolve(resolveSession: ResolveSession, anonymousInitializer: KtAnonymousInitializer, file: KtFile, statementFilter: StatementFilter): BindingTrace {
+        val trace = createDelegatingTrace(anonymousInitializer)
 
-        val classOrObjectDescriptor = resolveSession.resolveToDescriptor(classInitializer.containingDeclaration) as LazyClassDescriptor
+        val classOrObjectDescriptor = resolveSession.resolveToDescriptor(anonymousInitializer.containingDeclaration) as LazyClassDescriptor
 
         val bodyResolver = createBodyResolver(resolveSession, trace, file, statementFilter)
-        bodyResolver.resolveAnonymousInitializer(DataFlowInfo.EMPTY, classInitializer, classOrObjectDescriptor)
+        bodyResolver.resolveAnonymousInitializer(DataFlowInfo.EMPTY, anonymousInitializer, classOrObjectDescriptor)
 
-        forceResolveAnnotationsInside(classInitializer)
+        forceResolveAnnotationsInside(anonymousInitializer)
 
         return trace
     }
@@ -540,7 +540,7 @@ public class ResolveElementCache(
 
         override fun getDeclaredClasses(): MutableMap<KtClassOrObject, ClassDescriptorWithResolutionScopes> = hashMapOf()
 
-        override fun getAnonymousInitializers(): MutableMap<KtClassInitializer, ClassDescriptorWithResolutionScopes> = hashMapOf()
+        override fun getAnonymousInitializers(): MutableMap<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> = hashMapOf()
 
         override fun getSecondaryConstructors(): MutableMap<KtSecondaryConstructor, ConstructorDescriptor> = hashMapOf()
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java
index 53c734fb5f2..6ca1d693a93 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider;
-import org.jetbrains.kotlin.psi.KtClassInitializer;
+import org.jetbrains.kotlin.psi.KtAnonymousInitializer;
 import org.jetbrains.kotlin.psi.KtModifierListOwner;
 import org.jetbrains.kotlin.psi.KtPsiUtil;
 
@@ -128,7 +128,7 @@ class KotlinStructureElementPresentation implements ColoredItemPresentation, Loc
             return text;
         }
 
-        if (navigatablePsiElement instanceof KtClassInitializer) {
+        if (navigatablePsiElement instanceof KtAnonymousInitializer) {
             return "<class initializer>";
         }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.java
index e2c5db9d461..5d77c3639cf 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.java
@@ -130,7 +130,7 @@ public class KotlinStructureViewElement implements StructureViewTreeElement, Que
         }
 
         final KtDeclaration declaration = (KtDeclaration) element;
-        if (declaration instanceof KtClassInitializer) {
+        if (declaration instanceof KtAnonymousInitializer) {
             return null;
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinDeclarationMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinDeclarationMover.java
index 18e6efcccc5..535dc243aee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinDeclarationMover.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinDeclarationMover.java
@@ -87,7 +87,7 @@ public class KotlinDeclarationMover extends AbstractKotlinUpDownMover {
         declaration.accept(
                 new KtVisitorVoid() {
                     @Override
-                    public void visitAnonymousInitializer(@NotNull KtClassInitializer initializer) {
+                    public void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer) {
                         PsiElement brace = initializer.getOpenBraceNode();
                         if (brace != null) {
                             memberSuspects.add(brace);
@@ -130,7 +130,7 @@ public class KotlinDeclarationMover extends AbstractKotlinUpDownMover {
     }
 
     private static final Class[] DECLARATION_CONTAINER_CLASSES =
-            {KtClassBody.class, KtClassInitializer.class, KtFunction.class, KtPropertyAccessor.class, KtFile.class};
+            {KtClassBody.class, KtAnonymousInitializer.class, KtFunction.class, KtPropertyAccessor.class, KtFile.class};
 
     private static final Class[] CLASSBODYLIKE_DECLARATION_CONTAINER_CLASSES = {KtClassBody.class, KtFile.class};
 
@@ -245,7 +245,7 @@ public class KotlinDeclarationMover extends AbstractKotlinUpDownMover {
         }
 
         if (nextParent != null) {
-            if (target instanceof KtClassInitializer && !(nextParent instanceof KtClassBody)) return null;
+            if (target instanceof KtAnonymousInitializer && !(nextParent instanceof KtClassBody)) return null;
 
             if (target instanceof KtEnumEntry) {
                 if (!(nextParent instanceof KtClassBody)) return null;
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java
index 328c133f316..87ce6811d28 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java
@@ -68,7 +68,7 @@ public class KotlinExpressionMover extends AbstractKotlinUpDownMover {
             {KtBlockExpression.class, KtWhenExpression.class, KtClassBody.class, KtFile.class};
 
     private final static Class[] FUNCTIONLIKE_ELEMENT_CLASSES =
-            {KtFunction.class, KtPropertyAccessor.class, KtClassInitializer.class};
+            {KtFunction.class, KtPropertyAccessor.class, KtAnonymousInitializer.class};
 
     private static final Predicate<KtElement> CHECK_BLOCK_LIKE_ELEMENT = new Predicate<KtElement>() {
         @Override
@@ -197,7 +197,7 @@ public class KotlinExpressionMover extends AbstractKotlinUpDownMover {
         while (current != null) {
             PsiElement parent = current.getParent();
             if (parent instanceof KtClassBody ||
-                parent instanceof KtClassInitializer ||
+                parent instanceof KtAnonymousInitializer ||
                 parent instanceof KtNamedFunction ||
                 (parent instanceof KtProperty && !((KtProperty) parent).isLocal())) {
                 return null;
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
index 800a90099c4..e099eb0b320 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
@@ -370,7 +370,7 @@ public class KotlinPositionManager(private val myDebugProcess: DebugProcess) : M
                         return PositionedElement(asmType.internalName, element)
                     }
                 }
-                element is KtClassInitializer -> {
+                element is KtAnonymousInitializer -> {
                     val parent = getElementToCalculateClassName(element.parent)
                     // Class-object initializer
                     if (parent is KtObjectDeclaration && parent.isCompanion()) {
@@ -417,7 +417,7 @@ public class KotlinPositionManager(private val myDebugProcess: DebugProcess) : M
                         KtFunctionLiteral::class.java,
                         KtNamedFunction::class.java,
                         KtProperty::class.java,
-                        KtClassInitializer::class.java)
+                        KtAnonymousInitializer::class.java)
 
         private fun getElementToCalculateClassName(notPositionedElement: PsiElement?): KtElement? {
             if (notPositionedElement?.javaClass in TYPES_TO_CALCULATE_CLASSNAME ) return notPositionedElement as KtElement
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
index 3dc160c0f48..71c082ba750 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
@@ -185,7 +185,7 @@ private fun addDebugExpressionBeforeContextElement(codeFragment: KtCodeFragment,
 
     fun insertNewInitializer(classBody: KtClassBody): PsiElement? {
         val initializer = psiFactory.createAnonymousInitializer()
-        val newInitializer = (classBody.addAfter(initializer, classBody.firstChild) as KtClassInitializer)
+        val newInitializer = (classBody.addAfter(initializer, classBody.firstChild) as KtAnonymousInitializer)
         val block = newInitializer.body as KtBlockExpression?
         return block?.lastChild
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
index cd6cc9c6bc0..83b85209823 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
@@ -71,7 +71,7 @@ public class KotlinCalleeMethodsTreeStructure extends KotlinCallTreeStructure {
 
             KtClassBody body = classOrObject.getBody();
             if (body != null) {
-                for (KtClassInitializer initializer : body.getAnonymousInitializers()) {
+                for (KtAnonymousInitializer initializer : body.getAnonymousInitializers()) {
                     KtExpression initializerBody = initializer.getBody();
                     if (initializerBody != null) {
                         elementsToAnalyze.add(initializerBody);
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
index ada1e6466ef..2d9ee5a1e2a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
@@ -39,7 +39,7 @@ public class MoveAssignmentToInitializerIntention :
         val rightExpression = element.right ?: return false
 
         val initializer = PsiTreeUtil.getParentOfType(element,
-                                                      KtClassInitializer::class.java,
+                                                      KtAnonymousInitializer::class.java,
                                                       KtSecondaryConstructor::class.java) ?: return false
 
         val target = findTargetProperty(element)
@@ -54,7 +54,7 @@ public class MoveAssignmentToInitializerIntention :
         val initializer = element.right ?: return
         val newInitializer = property.setInitializer(initializer)!!
 
-        val initializerBlock = element.getStrictParentOfType<KtClassInitializer>()
+        val initializerBlock = element.getStrictParentOfType<KtAnonymousInitializer>()
         element.delete()
         if (initializerBlock != null && (initializerBlock.body as? KtBlockExpression)?.isEmpty() == true) {
             initializerBlock.delete()
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/KtDeclarationTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/KtDeclarationTreeNode.java
index da8452e4132..a00ebef3591 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/KtDeclarationTreeNode.java
+++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KtDeclarationTreeNode.java
@@ -51,7 +51,7 @@ public class KtDeclarationTreeNode extends AbstractPsiBasedNode<KtDeclaration> {
     protected void updateImpl(PresentationData data) {
         KtDeclaration declaration = getValue();
         if (declaration != null) {
-            String text = declaration instanceof KtClassInitializer ? CLASS_INITIALIZER : declaration.getName();
+            String text = declaration instanceof KtAnonymousInitializer ? CLASS_INITIALIZER : declaration.getName();
             if (text == null) return;
 
             KotlinCodeStyleSettings settings = CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
index b59e3d2b279..f08b31cf0e9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
@@ -85,14 +85,14 @@ object CreateParameterByRefActionFactory : CreateParameterFromUsageFactory<KtSim
             return element.parents
                     .filter {
                         it is KtNamedFunction || it is KtSecondaryConstructor || it is KtPropertyAccessor ||
-                        it is KtClassBody || it is KtClassInitializer || it is KtDelegationSpecifier
+                        it is KtClassBody || it is KtAnonymousInitializer || it is KtDelegationSpecifier
                     }
                     .firstOrNull()
                     ?.let {
                         when {
                             (it is KtNamedFunction || it is KtSecondaryConstructor) && varExpected,
                             it is KtPropertyAccessor -> chooseContainingClass(it)
-                            it is KtClassInitializer -> it.parent?.parent as? KtClass
+                            it is KtAnonymousInitializer -> it.parent?.parent as? KtClass
                             it is KtDelegationSpecifier -> {
                                 val klass = it.getStrictParentOfType<KtClassOrObject>()
                                 if (klass is KtClass && !klass.isInterface() && klass !is KtEnumEntry) klass else null
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
index 1c69fcc0d40..69ca04098d4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
@@ -89,7 +89,7 @@ data class ExtractionData(
 
     val insertBefore: Boolean = options.extractAsProperty
                                 || targetSibling.getStrictParentOfType<KtDeclaration>()?.let {
-                                    it is KtDeclarationWithBody || it is KtClassInitializer
+                                    it is KtDeclarationWithBody || it is KtAnonymousInitializer
                                 } ?: false
 
     fun getExpressions(): List<KtExpression> = originalElements.filterIsInstance<KtExpression>()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
index 46ae89eb685..61fa39c9a21 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
@@ -722,7 +722,7 @@ private fun ExtractionData.suggestFunctionNames(returnType: KotlinType): List<St
     val validator =
             NewDeclarationNameValidator(
                     targetSibling.parent,
-                    if (targetSibling is KtClassInitializer) targetSibling.parent else targetSibling,
+                    if (targetSibling is KtAnonymousInitializer) targetSibling.parent else targetSibling,
                     if (options.extractAsProperty) NewDeclarationNameValidator.Target.VARIABLES else NewDeclarationNameValidator.Target.FUNCTIONS_AND_CLASSES
             )
     if (!returnType.isDefault()) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
index 912f09ae284..2a5e88f7fce 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
@@ -88,7 +88,7 @@ public data class IntroduceParameterDescriptor(
                 when {
                     it.getParent() != callable.getBody() ->
                         false
-                    it is KtClassInitializer ->
+                    it is KtAnonymousInitializer ->
                         true
                     it is KtProperty && it.getInitializer()?.getTextRange()?.intersects(originalRange.getTextRange()) ?: false ->
                         true
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index b8220226d87..af542aa4c3b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -160,7 +160,7 @@ public fun PsiElement.getExtractionContainers(strict: Boolean = true, includeAll
         return (if (strict) element.parents else element.parentsWithSelf)
                 .filter {
                     (it is KtDeclarationWithBody && it !is KtFunctionLiteral)
-                    || it is KtClassInitializer
+                    || it is KtAnonymousInitializer
                     || it is KtClassBody
                     || it is KtFile
                 }
@@ -170,7 +170,7 @@ public fun PsiElement.getExtractionContainers(strict: Boolean = true, includeAll
     if (includeAll) return getAllExtractionContainers(strict)
 
     val enclosingDeclaration = getEnclosingDeclaration(this, strict)?.let {
-        if (it is KtDeclarationWithBody || it is KtClassInitializer) getEnclosingDeclaration(it, true) else it
+        if (it is KtDeclarationWithBody || it is KtAnonymousInitializer) getEnclosingDeclaration(it, true) else it
     }
 
     return when (enclosingDeclaration) {
@@ -179,7 +179,7 @@ public fun PsiElement.getExtractionContainers(strict: Boolean = true, includeAll
         else -> {
             val targetContainer = when (enclosingDeclaration) {
                 is KtDeclarationWithBody -> enclosingDeclaration.getBodyExpression()
-                is KtClassInitializer -> enclosingDeclaration.getBody()
+                is KtAnonymousInitializer -> enclosingDeclaration.getBody()
                 else -> null
             }
             if (targetContainer is KtBlockExpression) Collections.singletonList(targetContainer) else Collections.emptyList()
@@ -328,7 +328,7 @@ public fun KtElement.getContextForContainingDeclarationBody(): BindingContext? {
         is KtWithExpressionInitializer -> enclosingDeclaration.getInitializer()
         is KtMultiDeclaration -> enclosingDeclaration.getInitializer()
         is KtParameter -> enclosingDeclaration.getDefaultValue()
-        is KtClassInitializer -> enclosingDeclaration.getBody()
+        is KtAnonymousInitializer -> enclosingDeclaration.getBody()
         is KtClass -> {
             val delegationSpecifierList = enclosingDeclaration.getDelegationSpecifierList()
             if (delegationSpecifierList.isAncestor(this)) this else null
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
index 493849bea08..68214bfa6f6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
@@ -501,9 +501,9 @@ class KotlinPullUpHelper(
     override fun moveFieldInitializations(movedFields: LinkedHashSet<PsiField>) {
         val psiFactory = KtPsiFactory(data.sourceClass)
 
-        fun KtClassOrObject.getOrCreateClassInitializer(): KtClassInitializer {
-            getOrCreateBody().declarations.lastOrNull { it is KtClassInitializer }?.let { return it as KtClassInitializer }
-            return addDeclaration(psiFactory.createAnonymousInitializer()) as KtClassInitializer
+        fun KtClassOrObject.getOrCreateClassInitializer(): KtAnonymousInitializer {
+            getOrCreateBody().declarations.lastOrNull { it is KtAnonymousInitializer }?.let { return it as KtAnonymousInitializer }
+            return addDeclaration(psiFactory.createAnonymousInitializer()) as KtAnonymousInitializer
         }
 
         fun KtElement.getConstructorBodyBlock(): KtBlockExpression? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index 0ae0477c814..65ac3bd52fb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -660,7 +660,7 @@ public class KotlinPsiUnifier(
                 e1 is KtMultiDeclaration && e2 is KtMultiDeclaration ->
                     if (matchMultiDeclarations(e1, e2)) null else UNMATCHED
 
-                e1 is KtClassInitializer && e2 is KtClassInitializer ->
+                e1 is KtAnonymousInitializer && e2 is KtAnonymousInitializer ->
                     null
 
                 e1 is KtDeclaration ->
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt
index c49d608457a..faa93eccb8b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.project.IdeaEnvironment
 import org.jetbrains.kotlin.idea.project.ResolveElementCache
-import org.jetbrains.kotlin.psi.KtClassInitializer
+import org.jetbrains.kotlin.psi.KtAnonymousInitializer
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtPsiUtil
 import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 
 public abstract class AbstractAdditionalResolveDescriptorRendererTest : AbstractDescriptorRendererTest() {
     override fun getDescriptor(declaration: KtDeclaration, container: ComponentProvider): DeclarationDescriptor {
-        if (declaration is KtClassInitializer || KtPsiUtil.isLocal(declaration)) {
+        if (declaration is KtAnonymousInitializer || KtPsiUtil.isLocal(declaration)) {
             return container.get<ResolveElementCache>()
                     .resolveToElement(declaration, BodyResolveMode.FULL)
                     .get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration)!!
diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
index 9257f6c86dc..a7e71fa4c69 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
@@ -195,7 +195,7 @@ public class DebugTextByStubTest : LightCodeInsightFixtureTestCase() {
         val tree = createStubTree("class A {\n init {} }")
         val initializer = tree.findChildStubByType(KtStubElementTypes.CLASS)!!.findChildStubByType(KtStubElementTypes.CLASS_BODY)!!
                 .findChildStubByType(KtStubElementTypes.ANONYMOUS_INITIALIZER)
-        assertEquals("initializer in STUB: class A", KtClassInitializer(initializer as KotlinPlaceHolderStub).getDebugText())
+        assertEquals("initializer in STUB: class A", KtAnonymousInitializer(initializer as KotlinPlaceHolderStub).getDebugText())
     }
 
     fun testClassObject() {
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java
index 9d824cfc23e..2280cde4ac6 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java
@@ -120,7 +120,7 @@ public class DeclarationBodyVisitor extends TranslatorVisitor<Void> {
     }
 
     @Override
-    public Void visitAnonymousInitializer(@NotNull KtClassInitializer expression, TranslationContext context) {
+    public Void visitAnonymousInitializer(@NotNull KtAnonymousInitializer expression, TranslationContext context) {
         // parsed it in initializer visitor => no additional actions are needed
         return null;
     }
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt
index ba6a795a945..d5ea40697ed 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.js.translate.initializer.InitializerVisitor
 import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getPropertyDescriptor
 import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
 import org.jetbrains.kotlin.psi.KtClass
-import org.jetbrains.kotlin.psi.KtClassInitializer
+import org.jetbrains.kotlin.psi.KtAnonymousInitializer
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
 import org.jetbrains.kotlin.psi.KtProperty
 
@@ -78,7 +78,7 @@ class FileDeclarationVisitor(
         return null
     }
 
-    public override fun visitAnonymousInitializer(expression: KtClassInitializer, context: TranslationContext?): Void? {
+    public override fun visitAnonymousInitializer(expression: KtAnonymousInitializer, context: TranslationContext?): Void? {
         expression.accept(initializerVisitor, initializerContext)
         return null
     }
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java
index 80274e308d4..90312838d4c 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java
@@ -57,7 +57,7 @@ public final class InitializerVisitor extends TranslatorVisitor<Void> {
     }
 
     @Override
-    public Void visitAnonymousInitializer(@NotNull KtClassInitializer initializer, @NotNull TranslationContext context) {
+    public Void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer, @NotNull TranslationContext context) {
         KtExpression initializerBody = initializer.getBody();
         if (initializerBody != null) {
             result.add(translateAsStatementAndMergeInBlockIfNeeded(initializerBody, context));