diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt
index bf221cbfeea..55576eac91b 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.android.synthetic.codegen
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.android.parcel.isMagicParcelable
+import org.jetbrains.kotlin.android.parcel.isParcelize
 import org.jetbrains.kotlin.codegen.ClassBuilder
 import org.jetbrains.kotlin.codegen.ClassBuilderFactory
 import org.jetbrains.kotlin.codegen.DelegatingClassBuilder
@@ -97,7 +97,7 @@ class ParcelableClinitClassBuilderInterceptorExtension : ClassBuilderInterceptor
         override fun done() {
             if (!isClinitGenerated && currentClass != null && currentClassName != null) {
                 val descriptor = bindingContext[BindingContext.CLASS, currentClass]
-                if (descriptor != null && descriptor.isMagicParcelable) {
+                if (descriptor != null && descriptor.isParcelize) {
                     val baseVisitor = super.newMethod(JvmDeclarationOrigin.NO_ORIGIN, ACC_STATIC, "<clinit>", "()V", null, null)
                     val visitor = ClinitAwareMethodVisitor(currentClassName!!, baseVisitor)
 
@@ -122,7 +122,7 @@ class ParcelableClinitClassBuilderInterceptorExtension : ClassBuilderInterceptor
                 isClinitGenerated = true
 
                 val descriptor = bindingContext[BindingContext.CLASS, currentClass]
-                if (descriptor != null && descriptor.isMagicParcelable) {
+                if (descriptor != null && descriptor.isParcelize) {
                     return ClinitAwareMethodVisitor(
                             currentClassName!!,
                             super.newMethod(origin, access, name, desc, signature, exceptions))
diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt
index 3a538470308..6bb4428f9bd 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt
@@ -64,7 +64,7 @@ open class ParcelableCodegenExtension : ExpressionCodegenExtension {
 
     override fun generateClassSyntheticParts(codegen: ImplementationBodyCodegen) {
         val parcelableClass = codegen.descriptor
-        if (!parcelableClass.isMagicParcelable) return
+        if (!parcelableClass.isParcelize) return
 
         val sourceElement = (codegen.myClass as? KtClassOrObject) ?: return
         if (!isExperimental(sourceElement)) return
diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt
index 8f32793433f..15288dc78a7 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt
@@ -78,7 +78,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
             declaration: KtFunction,
             diagnosticHolder: DiagnosticSink
     ) {
-        if (!containingClass.isMagicParcelable) return
+        if (!containingClass.isParcelize) return
 
         if (method.isWriteToParcel() && declaration.hasModifier(KtTokens.OVERRIDE_KEYWORD)) {
             val reportElement = declaration.modifierList?.getModifier(KtTokens.OVERRIDE_KEYWORD) ?: declaration.nameIdentifier ?: declaration
@@ -93,7 +93,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
             diagnosticHolder: DiagnosticSink,
             bindingContext: BindingContext
     ) {
-        if (containingClass.isMagicParcelable
+        if (containingClass.isParcelize
                 && (declaration.hasDelegate() || bindingContext[BindingContext.BACKING_FIELD_REQUIRED, property] == true)
                 && !property.annotations.hasAnnotation(TRANSIENT_FQNAME)
         ) {
@@ -103,7 +103,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
         // @JvmName is not applicable to property so we can check just the descriptor name
         if (property.name.asString() == "CREATOR" && property.findJvmFieldAnnotation() != null && containingClass.isCompanionObject) {
             val outerClass = containingClass.containingDeclaration as? ClassDescriptor
-            if (outerClass != null && outerClass.isMagicParcelable) {
+            if (outerClass != null && outerClass.isParcelize) {
                 diagnosticHolder.report(ErrorsAndroid.CREATOR_DEFINITION_IS_NOT_ALLOWED.on(declaration.nameIdentifier ?: declaration))
             }
         }
@@ -115,7 +115,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
             diagnosticHolder: DiagnosticSink,
             bindingContext: BindingContext
     ) {
-        if (!descriptor.isMagicParcelable) return
+        if (!descriptor.isParcelize) return
 
         if (declaration !is KtClass || (declaration.isAnnotation() || declaration.isInterface())) {
             val reportElement = (declaration as? KtClassOrObject)?.nameIdentifier ?: declaration
diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableResolveExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableResolveExtension.kt
index 568775fbc72..ad987f74b89 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableResolveExtension.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableResolveExtension.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.android.parcel
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import org.jetbrains.kotlin.android.parcel.ParcelableSyntheticComponent.ComponentKind.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
@@ -90,13 +90,13 @@ open class ParcelableResolveExtension : SyntheticResolveExtension {
         }
 
         if (name.asString() == DESCRIBE_CONTENTS.methodName
-                && clazz.isMagicParcelable
+                && clazz.isParcelize
                 && isExperimental()
                 && result.none { it.isDescribeContents() }
         ) {
             result += createMethod(clazz, DESCRIBE_CONTENTS, clazz.builtIns.intType)
         } else if (name.asString() == WRITE_TO_PARCEL.methodName
-                && clazz.isMagicParcelable
+                && clazz.isParcelize
                 && isExperimental()
                 && result.none { it.isWriteToParcel() }
         ) {
@@ -133,7 +133,7 @@ interface ParcelableSyntheticComponent {
     }
 }
 
-private val MAGIC_PARCEL_CLASS_FQNAME = FqName(MagicParcel::class.java.canonicalName)
+private val PARCELIZE_CLASS_FQNAME = FqName(Parcelize::class.java.canonicalName)
 
-internal val ClassDescriptor.isMagicParcelable: Boolean
-    get() = this.annotations.hasAnnotation(MAGIC_PARCEL_CLASS_FQNAME)
\ No newline at end of file
+internal val ClassDescriptor.isParcelize: Boolean
+    get() = this.annotations.hasAnnotation(PARCELIZE_CLASS_FQNAME)
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt
index e3026c87f93..b350611cc61 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.android.parcel.serializers
 
-import org.jetbrains.kotlin.android.parcel.isMagicParcelable
+import org.jetbrains.kotlin.android.parcel.isParcelize
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
@@ -181,7 +181,7 @@ interface ParcelSerializer {
 
                         val creatorAsmType = when {
                             creatorVar != null -> typeMapper.mapTypeSafe(creatorVar.type)
-                            clazz.isMagicParcelable -> Type.getObjectType(asmType.internalName + "\$Creator")
+                            clazz.isParcelize -> Type.getObjectType(asmType.internalName + "\$Creator")
                             else -> null
                         }
 
diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt
index 32e3b2c09a8..806bf75c475 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt
@@ -80,7 +80,7 @@ class DefaultErrorMessagesAndroid : DefaultErrorMessages.Extension {
                     "'CREATOR' definition is not allowed. Use 'Parceler' companion object instead.")
 
             MAP.put(ErrorsAndroid.PARCELABLE_TYPE_NOT_SUPPORTED,
-                    "Type is not directly supported by 'MagicParcelable'. " +
+                    "Type is not directly supported by 'Parcelize'. " +
                     "Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'")
         }
     }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt
index 6ec7e16f3a0..2e7e241def6 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt
@@ -8,7 +8,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import java.util.Arrays
 
-@MagicParcel
+@Parcelize
 data class Test(val a: Array<String>) : Parcelable {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt
index 8a9b2434607..37cda5c8a66 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt
@@ -8,7 +8,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import java.util.Arrays
 
-@MagicParcel
+@Parcelize
 data class Test(
         val a: Array<String>,
         val b: Array<String?>,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt
index 1eb3fa91a5b..b6abdd3d632 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class BoxedTypes(
         val boo: java.lang.Boolean,
         val c: java.lang.Character,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt
index 0739489d075..3f5944be59d 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt
@@ -8,7 +8,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.os.Bundle
 
-@MagicParcel
+@Parcelize
 data class User(val a: Bundle) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt
index 488178f6f74..7c607c8d8a5 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt
@@ -8,7 +8,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.text.SpannableString
 
-@MagicParcel
+@Parcelize
 data class Test(val simple: CharSequence, val spanned: CharSequence) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt
index 608a2debde8..c5310546588 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class User(val firstName: String, val secondName: String, val age: Int) : Parcelable {
     private companion object : Parceler<User> {
         override fun User.write(parcel: Parcel, flags: Int) {
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt
index e68a86b5c05..09513e57808 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt
@@ -11,7 +11,7 @@ enum class Color {
     BLACK, WHITE
 }
 
-@MagicParcel
+@Parcelize
 data class Test(val name: String, val color: Color) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt
index 479ddbdc3cd..90c966480ea 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt
@@ -9,7 +9,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import java.util.*
 
-@MagicParcel
+@Parcelize
 data class Test(
         val a: List<String>,
         val b: MutableList<String>,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt
index db4c01d2d3e..463ab321c52 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class Test(val a: List<String>) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt
index 71750bc8b88..c856e4c4a2e 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class Test(
         val a: List<String>,
         val b: List<String?>,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt
index 93bd64cf649..453f172dd76 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt
@@ -9,7 +9,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import java.util.*
 
-@MagicParcel
+@Parcelize
 data class Test(
         val a: Map<String, String>,
         val b: MutableMap<String, String>,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt
index a55a9c4bf79..bb46f364f05 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class Test(val a: Map<String, String>) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt
index 6642b3bd9d1..48a0538ae44 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class Test(
         val a: Map<String, String>,
         val b: Map<String?, String>,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt
index 9937b43b456..fcf8806fed3 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt
@@ -10,15 +10,15 @@ import android.os.Parcelable
 // Starts with A, should be loaded before other classes
 abstract class AParcelable : Parcelable
 
-@MagicParcel
+@Parcelize
 data class P1(val a: String) : AParcelable()
 
 sealed class Sealed : AParcelable()
 
-@MagicParcel
+@Parcelize
 data class Sealed1(val a: Int) : Sealed()
 
-@MagicParcel
+@Parcelize
 data class Test(val a: P1, val b: AParcelable, val c: Sealed, val d: Sealed1) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt
index cedbb5af913..dbacafbf139 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class Test(
     val str1: String,
     val str2: String?,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt
index fdf3ed5f62c..c90ff71fd05 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class Test(val a: String?) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt
index a673c3c52e0..293b9e2a9a8 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt
@@ -11,7 +11,7 @@ object Obj1 {
     object Obj2
 }
 
-@MagicParcel
+@Parcelize
 data class Test(val o1: Obj1, val o2: Obj1.Obj2, val com: Com) : Parcelable {
     companion object Com {
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt
index 5d2b20fa544..4c95ab3e4f2 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class PrimitiveTypes(
         val boo: Boolean,
         val c: Char,
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt
index 95bd55c536f..505f41893c2 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 data class User(val firstName: String, val secondName: String, val age: Int) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt
index 65a12780ce2..8fb05660792 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt
@@ -8,10 +8,10 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.util.*
 
-@MagicParcel
+@Parcelize
 data class Data(val a: String, val b: String) : Parcelable
 
-@MagicParcel
+@Parcelize
 data class User(val a: SparseIntArray, val b: SparseLongArray, val c: SparseArray<Data>) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt
index 0c9c8ad7e92..851b14e1f9a 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt
@@ -8,7 +8,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.util.SparseBooleanArray
 
-@MagicParcel
+@Parcelize
 data class User(val a: SparseBooleanArray) : Parcelable
 
 fun box() = parcelTest { parcel ->
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.kt
index 104b477ba42..d204a33033e 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.kt
@@ -5,5 +5,5 @@ import android.os.Parcelable
 import android.os.IBinder
 import android.os.IInterface
 
-@MagicParcel
+@Parcelize
 class User(val binder: IBinder, val intf: IInterface?) : Parcelable
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.kt
index 8be71dbffad..01759ef4fd0 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.kt
@@ -3,7 +3,7 @@
 import kotlinx.android.parcel.*
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class User(val firstName: String, val lastName: String, val age: Int, val isProUser: Boolean) : Parcelable {
     override fun describeContents() = 100
 }
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.kt
index 40a6d955eed..01de5a89e37 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.kt
@@ -4,7 +4,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class User(val firstName: String, val lastName: String, val age: Int) : Parcelable {
     private companion object : Parceler<User> {
         override fun User.write(parcel: Parcel, flags: Int) {
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.kt
index 81f56cb4e62..00b5fe986d6 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.kt
@@ -4,7 +4,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcel
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class User(val firstName: String, val lastName: String, val age: Int) : Parcelable {
     private companion object : Parceler<User> {
         override fun User.write(parcel: Parcel, flags: Int) {
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.kt
index 55291cab7da..f33525b9ecb 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.kt
@@ -5,7 +5,7 @@ import kotlinx.android.parcel.*
 import android.os.Parcelable
 import kotlin.jvm.JvmStatic
 
-@MagicParcel
+@Parcelize
 class User(val firstName: String) : Parcelable {
     companion object {
         @JvmStatic
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.kt
index 3338f43dad1..f1f5d2686fc 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.kt
@@ -2,5 +2,5 @@
 
 import kotlinx.android.parcel.*
 
-@MagicParcel
+@Parcelize
 class Test(val names: List<List<List<String>>>)
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.kt
index 46f9ccdd050..2b9e36b6c57 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.kt
@@ -3,8 +3,8 @@
 import android.util.Size
 import kotlinx.android.parcel.*
 
-@MagicParcel
+@Parcelize
 class TestNullable(val a: Size?)
 
-@MagicParcel
+@Parcelize
 class TestNotNull(val a: Size)
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.kt
index c274c7027d7..35942bfd67c 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.kt
@@ -6,5 +6,5 @@ import java.io.Serializable
 
 class SerializableSimple(val a: String, val b: String) : Serializable
 
-@MagicParcel
+@Parcelize
 class User(val notNull: SerializableSimple, val nullable: SerializableSimple) : Parcelable
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.kt
index 2afee9c3fac..06836514910 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.kt
@@ -3,5 +3,5 @@
 import kotlinx.android.parcel.*
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class User(val firstName: String, val lastName: String, val age: Int, val isProUser: Boolean) : Parcelable
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.kt
index 049dfa6ae73..30bb4cdea3f 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.kt
@@ -2,5 +2,5 @@
 
 import kotlinx.android.parcel.*
 
-@MagicParcel
+@Parcelize
 class Test(val names: List<String>)
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.kt
index 3d00a97a196..b80d0bef848 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.kt
@@ -5,8 +5,8 @@ import android.os.Parcelable
 import android.util.Size
 import android.util.SizeF
 
-@MagicParcel
+@Parcelize
 data class Test(val size: Size, val nullable: Size?) : Parcelable
 
-@MagicParcel
+@Parcelize
 data class TestF(val size: SizeF, val nullable: SizeF?) : Parcelable
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/constructors.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/constructors.kt
index d6f9a31be88..a900a978953 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/constructors.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/constructors.kt
@@ -1,26 +1,26 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class A : Parcelable
 
-@MagicParcel
+@Parcelize
 class B(val firstName: String, val secondName: String) : Parcelable
 
-@MagicParcel
+@Parcelize
 class C(val firstName: String, <error descr="[PARCELABLE_CONSTRUCTOR_PARAMETER_SHOULD_BE_VAL_OR_VAR] 'Parcelable' constructor parameter should be 'val' or 'var'">secondName</error>: String) : Parcelable
 
-@MagicParcel
+@Parcelize
 class D(val firstName: String, vararg val secondName: String) : Parcelable
 
-@MagicParcel
+@Parcelize
 class E(val firstName: String, val secondName: String) : Parcelable {
     constructor() : this("", "")
 }
 
-@MagicParcel
+@Parcelize
 class <error descr="[PARCELABLE_SHOULD_HAVE_PRIMARY_CONSTRUCTOR] 'Parcelable' should have a primary constructor">F</error> : Parcelable {
     constructor(a: String) {
         println(a)
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customCreator.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customCreator.kt
index 70a85f715f7..e821a32d50b 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customCreator.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customCreator.kt
@@ -1,10 +1,10 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 import android.os.Parcel
 
-@MagicParcel
+@Parcelize
 class A(val a: String) : Parcelable {
     companion object {
         @JvmField
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customWriteToParcel.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customWriteToParcel.kt
index 8eda68549e5..73eaeacdf03 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customWriteToParcel.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/customWriteToParcel.kt
@@ -1,21 +1,21 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 import android.os.Parcel
 
-@MagicParcel
+@Parcelize
 class A(val a: String) : Parcelable {
     <error descr="[OVERRIDING_WRITE_TO_PARCEL_IS_NOT_ALLOWED] Overriding 'writeToParcel' is not allowed. Use 'Parceler' companion object instead.">override</error> fun writeToParcel(p: Parcel?, flags: Int) {}
     override fun describeContents() = 0
 }
 
-@MagicParcel
+@Parcelize
 class B(val a: String) : Parcelable {
     <error descr="[OVERRIDING_WRITE_TO_PARCEL_IS_NOT_ALLOWED] Overriding 'writeToParcel' is not allowed. Use 'Parceler' companion object instead.">override</error> fun writeToParcel(p: Parcel?, flags: Int) {}
 }
 
-@MagicParcel
+@Parcelize
 class C(val a: String) : Parcelable {
     <error descr="[OVERRIDING_WRITE_TO_PARCEL_IS_NOT_ALLOWED] Overriding 'writeToParcel' is not allowed. Use 'Parceler' companion object instead.">override</error> fun writeToParcel(p: Parcel, flags: Int) {}
 }
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/delegate.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/delegate.kt
index 0722a4661a6..6dbb00a48ee 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/delegate.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/delegate.kt
@@ -1,6 +1,6 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 import android.os.Parcel
 
@@ -9,5 +9,5 @@ open class Delegate : Parcelable {
     override fun describeContents() = 0
 }
 
-@MagicParcel
+@Parcelize
 class Test : Parcelable <error descr="[PARCELABLE_DELEGATE_IS_NOT_ALLOWED] Delegating 'Parcelable' is now allowed">by</error> Delegate()
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/emptyPrimaryConstructor.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/emptyPrimaryConstructor.kt
index c181fa9e501..15049851d56 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/emptyPrimaryConstructor.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/emptyPrimaryConstructor.kt
@@ -1,10 +1,10 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class User : Parcelable
 
-@MagicParcel
+@Parcelize
 class <warning descr="[PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY] The primary constructor is empty, no data will be serialized to 'Parcel'">User2</warning>() : Parcelable
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt
index c94712fca2f..43c46039215 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt
@@ -1,31 +1,31 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 open class Open(val foo: String) : Parcelable
 
-@MagicParcel
+@Parcelize
 class Final(val foo: String) : Parcelable
 
-@MagicParcel
+@Parcelize
 <error descr="[PARCELABLE_SHOULD_BE_INSTANTIABLE] 'Parcelable' should not be a 'sealed' or 'abstract' class">abstract</error> class Abstract(val foo: String) : Parcelable
 
-@MagicParcel
+@Parcelize
 <error descr="[PARCELABLE_SHOULD_BE_INSTANTIABLE] 'Parcelable' should not be a 'sealed' or 'abstract' class">sealed</error> class Sealed(val foo: String) : Parcelable {
     class X : Sealed("")
 }
 
 class Outer {
-    @MagicParcel
+    @Parcelize
     <error descr="[PARCELABLE_CANT_BE_INNER_CLASS] 'Parcelable' can't be an inner class">inner</error> class Inner(val foo: String) : Parcelable
 }
 
 fun foo() {
-    @MagicParcel
+    @Parcelize
     <error descr="[PARCELABLE_SHOULD_BE_CLASS] 'Parcelable' should be a class">object</error> : Parcelable {}
 
-    @MagicParcel
+    @Parcelize
     class <error descr="[NO_PARCELABLE_SUPERTYPE] No 'Parcelable' supertype"><error descr="[PARCELABLE_CANT_BE_LOCAL_CLASS] 'Parcelable' can't be a local class">Local</error></error> {}
 }
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/notMagicParcel.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/notMagicParcel.kt
index 5bd2eb6daa7..0be69884e0e 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/notMagicParcel.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/notMagicParcel.kt
@@ -1,6 +1,6 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcel
 import android.os.Parcelable
 
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/properties.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/properties.kt
index 97c0d2b14ea..d695cf42f79 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/properties.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/properties.kt
@@ -1,9 +1,9 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class A(val firstName: String) : Parcelable {
     val <warning descr="[PROPERTY_WONT_BE_SERIALIZED] Property would not be serialized into a 'Parcel'. Add '@Transient' annotation to it">secondName</warning>: String = ""
 
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/simple.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/simple.kt
index b496c020122..183d6c3814f 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/simple.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/simple.kt
@@ -1,7 +1,7 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class User(val firstName: String, val secondName: String, val age: Int) : Parcelable
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/unsupportedType.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/unsupportedType.kt
index 61fd4429480..485c1ca2c9a 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/unsupportedType.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/unsupportedType.kt
@@ -1,15 +1,15 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import kotlinx.android.parcel.RawValue
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class User(
         val a: String,
-        val b: <error descr="[PARCELABLE_TYPE_NOT_SUPPORTED] Type is not directly supported by 'MagicParcelable'. Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'">Any</error>,
-        val c: <error descr="[PARCELABLE_TYPE_NOT_SUPPORTED] Type is not directly supported by 'MagicParcelable'. Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'">Any?</error>,
-        val d: <error descr="[PARCELABLE_TYPE_NOT_SUPPORTED] Type is not directly supported by 'MagicParcelable'. Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'">Map<Any, String></error>,
+        val b: <error descr="[PARCELABLE_TYPE_NOT_SUPPORTED] Type is not directly supported by 'Parcelize'. Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'">Any</error>,
+        val c: <error descr="[PARCELABLE_TYPE_NOT_SUPPORTED] Type is not directly supported by 'Parcelize'. Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'">Any?</error>,
+        val d: <error descr="[PARCELABLE_TYPE_NOT_SUPPORTED] Type is not directly supported by 'Parcelize'. Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'">Map<Any, String></error>,
         val e: @RawValue Any?,
         val f: @RawValue Map<String, Any>,
         val g: Map<String, @RawValue Any>,
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/withoutParcelableSupertype.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/withoutParcelableSupertype.kt
index 108f5cf584a..98e3cdb416d 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/withoutParcelableSupertype.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/withoutParcelableSupertype.kt
@@ -1,20 +1,20 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 class <error descr="[NO_PARCELABLE_SUPERTYPE] No 'Parcelable' supertype">Without</error>(val firstName: String, val secondName: String, val age: Int)
 
-@MagicParcel
+@Parcelize
 class With(val firstName: String, val secondName: String, val age: Int) : Parcelable
 
 interface MyParcelableIntf : Parcelable
 
 abstract class MyParcelableCl : Parcelable
 
-@MagicParcel
+@Parcelize
 class WithIntfSubtype(val firstName: String, val secondName: String, val age: Int) : MyParcelableIntf
 
-@MagicParcel
+@Parcelize
 class WithClSubtype(val firstName: String, val secondName: String, val age: Int) : MyParcelableCl()
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt
index 54d9c52c652..a37b8a62e15 100644
--- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt
+++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt
@@ -1,25 +1,25 @@
 package test
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import android.os.Parcelable
 
-@MagicParcel
+@Parcelize
 interface <error descr="[PARCELABLE_SHOULD_BE_CLASS] 'Parcelable' should be a class">Intf</error> : Parcelable
 
-@MagicParcel
+@Parcelize
 object <error descr="[PARCELABLE_SHOULD_BE_CLASS] 'Parcelable' should be a class">Obj</error>
 
 class A {
-    @MagicParcel
+    @Parcelize
     companion <error descr="[PARCELABLE_SHOULD_BE_CLASS] 'Parcelable' should be a class">object</error> {
         fun foo() {}
     }
 }
 
-@MagicParcel
+@Parcelize
 enum class <error descr="[PARCELABLE_SHOULD_BE_CLASS] 'Parcelable' should be a class">Enum</error> {
     WHITE, BLACK
 }
 
-@MagicParcel
+@Parcelize
 annotation class <error descr="[PARCELABLE_SHOULD_BE_CLASS] 'Parcelable' should be a class">Anno</error>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-runtime/src/kotlinx/android/parcel/MagicParcel.kt b/plugins/android-extensions/android-extensions-runtime/src/kotlinx/android/parcel/Parcelize.kt
similarity index 97%
rename from plugins/android-extensions/android-extensions-runtime/src/kotlinx/android/parcel/MagicParcel.kt
rename to plugins/android-extensions/android-extensions-runtime/src/kotlinx/android/parcel/Parcelize.kt
index d3354050839..7efde3d0732 100644
--- a/plugins/android-extensions/android-extensions-runtime/src/kotlinx/android/parcel/MagicParcel.kt
+++ b/plugins/android-extensions/android-extensions-runtime/src/kotlinx/android/parcel/Parcelize.kt
@@ -25,4 +25,4 @@ package kotlinx.android.parcel
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.BINARY)
-annotation class MagicParcel
\ No newline at end of file
+annotation class Parcelize
\ No newline at end of file