rename platformName annotation to jvmName

libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt

@@ -34,6 +34,16 @@ public annotation(retention = AnnotationRetention.BINARY, mustBeDocumented = tru
 target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
 public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class jvmStatic
 
+/**
+ * Specifies the name for the Java class or method
+ * which is generated from this element.
+ * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#handling-signature-clashes-with-platformname)
+ * for more information.
+ * @property name the name of the element.
+ */
+target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
+public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class jvmName(public val name: String)
+
 /**
  * Instructs the Kotlin compiler to generate a public backing field for this property.
  */

libraries/stdlib/src/kotlin/platform/annotations.kt

@@ -18,14 +18,8 @@ package kotlin.platform
 
 import kotlin.annotation.AnnotationTarget.*
 
-/**
- * Specifies the name for the target platform element (Java method, JavaScript function)
- * which is generated from this element.
- * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#handling-signature-clashes-with-platformname)
- * for more information.
- * @property name the name of the element.
- */
 target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER)
+deprecated("Use kotlin.jvm.jvmName instead", ReplaceWith("kotlin.jvm.jvmName"))
 public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformName(public val name: String)
 
 target(FUNCTION, PROPERTY, FIELD, PROPERTY_GETTER, PROPERTY_SETTER)