diff --git a/core/src/main/java/io/grpc/ChannelImpl.java b/core/src/main/java/io/grpc/ChannelImpl.java
index 3812a9c376..c57f9f8328 100644
--- a/core/src/main/java/io/grpc/ChannelImpl.java
+++ b/core/src/main/java/io/grpc/ChannelImpl.java
@@ -256,7 +256,7 @@ public final class ChannelImpl extends Channel {
    *
    * @see ClientTransport#ping(PingCallback, Executor)
    */
-  @ExperimentalApi(comment = "https://github.com/grpc/grpc-java/issues/737")
+  @ExperimentalApi("https://github.com/grpc/grpc-java/issues/737")
   public void ping(final PingCallback callback, final Executor executor) {
     try {
       obtainActiveTransport().ping(callback, executor);
diff --git a/core/src/main/java/io/grpc/Context.java b/core/src/main/java/io/grpc/Context.java
index 07f01066b0..71ea21132f 100644
--- a/core/src/main/java/io/grpc/Context.java
+++ b/core/src/main/java/io/grpc/Context.java
@@ -110,7 +110,7 @@ import javax.annotation.Nullable;
  * responsibility of the application to ensure that all contexts are properly cancelled.</li>
  * </ul>
  */
-@ExperimentalApi(comment = "https://github.com/grpc/grpc-java/issues/262")
+@ExperimentalApi("https://github.com/grpc/grpc-java/issues/262")
 public class Context {
 
   private static final Logger LOG = Logger.getLogger(Context.class.getName());
diff --git a/core/src/main/java/io/grpc/ExperimentalApi.java b/core/src/main/java/io/grpc/ExperimentalApi.java
index 6281592590..4a57ee8179 100644
--- a/core/src/main/java/io/grpc/ExperimentalApi.java
+++ b/core/src/main/java/io/grpc/ExperimentalApi.java
@@ -63,5 +63,5 @@ public @interface ExperimentalApi {
   /**
    * Context information such as links to discussion thread, tracking issue etc.
    */
-  String comment() default "";
+  String value() default "";
 }