diff --git a/user/test/com/google/gwt/i18n/client/Moods.java b/user/test/com/google/gwt/i18n/client/Moods.java
index 0bd8922..e5cc508 100644
--- a/user/test/com/google/gwt/i18n/client/Moods.java
+++ b/user/test/com/google/gwt/i18n/client/Moods.java
@@ -24,26 +24,26 @@
   /**
    * The word for 'Happy'.
    * 
-   * @gwt.key 123
    * @return 'happy'
    */
+  @Key("123")
   String getHappy();
 
   /**
    * Convenience method to get all key/value pairs associated with the mood
    * array.
    * 
-   * @gwt.key moods
    * @return returnType of moods
    */
+  @Key("moods")
   Map moodMap();
 
   /**
    * Gets the keys associated with moods. However note that this will not
    * display well as the values are "Sad", "123".
    * 
-   * @gwt.key moods
    * @return array of moods
    */
+  @Key("moods")
   String[] moodArray();
 }
diff --git a/user/test/com/google/gwt/i18n/client/TestConstants.java b/user/test/com/google/gwt/i18n/client/TestConstants.java
index e97674a..6cdaa59 100644
--- a/user/test/com/google/gwt/i18n/client/TestConstants.java
+++ b/user/test/com/google/gwt/i18n/client/TestConstants.java
@@ -59,9 +59,7 @@
 
   float floatZero();
 
-  /**
-   * @gwt.key string
-   */
+  @Key("string")
   String getString();
 
   int intMax();