1.1 --- a/rt/emul/compact/src/main/java/java/util/EnumMap.java	Wed Oct 09 22:02:34 2013 +0200
     1.2 +++ b/rt/emul/compact/src/main/java/java/util/EnumMap.java	Wed Oct 09 22:03:26 2013 +0200
     1.3 @@ -737,7 +737,7 @@
     1.4       * Returns all of the values comprising K.
     1.5       * The result is uncloned, cached, and shared by all callers.
     1.6       */
     1.7 -    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.$VALUES;")
     1.8 +    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.fld_$VALUES;")
     1.9      private static native <K extends Enum<K>> K[] getKeyUniverse(Class<K> keyType);
    1.10  
    1.11      private static final long serialVersionUID = 458661240069192865L;

     2.1 --- a/rt/emul/compact/src/main/java/java/util/EnumSet.java	Wed Oct 09 22:02:34 2013 +0200
     2.2 +++ b/rt/emul/compact/src/main/java/java/util/EnumSet.java	Wed Oct 09 22:03:26 2013 +0200
     2.3 @@ -384,7 +384,7 @@
     2.4       * Returns all of the values comprising E.
     2.5       * The result is uncloned, cached, and shared by all callers.
     2.6       */
     2.7 -    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.$VALUES;")
     2.8 +    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.fld_$VALUES;")
     2.9      private static native <E extends Enum<E>> E[] getUniverse(Class<E> elementType);
    2.10  
    2.11      /**

     3.1 --- a/rt/emul/mini/src/main/java/java/lang/Enum.java	Wed Oct 09 22:02:34 2013 +0200
     3.2 +++ b/rt/emul/mini/src/main/java/java/lang/Enum.java	Wed Oct 09 22:03:26 2013 +0200
     3.3 @@ -235,7 +235,7 @@
     3.4          throw new IllegalArgumentException();
     3.5      }
     3.6      
     3.7 -    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.$VALUES;")
     3.8 +    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.fld_$VALUES;")
     3.9      private static native Object[] values(Class<?> enumType);
    3.10  
    3.11      /**

     4.1 --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Wed Oct 09 22:02:34 2013 +0200
     4.2 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Wed Oct 09 22:03:26 2013 +0200
     4.3 @@ -1880,7 +1880,7 @@
     4.4                  requireReference(slashType);
     4.5                  
     4.6                  out.append(accessClass(slashType.replace('/', '_')))
     4.7 -                   .append("(false).constructor.").append(value);
     4.8 +                   .append("(false).constructor.fld_").append(value);
     4.9              }
    4.10          };
    4.11          ap.parse(data, cd);