--- old/hotspot/src/share/vm/classfile/classFileParser.cpp	2017-09-14 22:57:40.000000000 -0700
+++ new/hotspot/src/share/vm/classfile/classFileParser.cpp	2017-09-14 22:57:40.000000000 -0700
@@ -1046,7 +1046,7 @@
     _jdk_internal_vm_annotation_Contended,
     _field_Stable,
     _jdk_internal_vm_annotation_ReservedStackAccess,
-    _jvm_internal_value_ValueCapableClass,
+    _jdk_incubator_mvt_ValueCapableClass,
     _annotation_LIMIT
   };
   const Location _location;
@@ -1083,7 +1083,7 @@
   void set_stable(bool stable) { set_annotation(_field_Stable); }
   bool is_stable() const { return has_annotation(_field_Stable); }
 
-  bool is_value_capable_class() const { return has_annotation(_jvm_internal_value_ValueCapableClass); }
+  bool is_value_capable_class() const { return has_annotation(_jdk_incubator_mvt_ValueCapableClass); }
 };
 
 // This class also doubles as a holder for metadata cleanup.
@@ -2134,11 +2134,11 @@
       if (RestrictReservedStack && !privileged) break; // honor privileges
       return _jdk_internal_vm_annotation_ReservedStackAccess;
     }
-    case vmSymbols::VM_SYMBOL_ENUM_NAME(jvm_internal_value_ValueCapableClass_signature) : {
+    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_mvt_ValueCapableClass_signature) : {
       if (_location != _in_class) {
         break;
       }
-      return _jvm_internal_value_ValueCapableClass;
+      return _jdk_incubator_mvt_ValueCapableClass;
     }
     default: {
       break;