--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Tue Nov 24 11:49:44 2015 +0000
@@ -1693,7 +1693,7 @@
     if (id == AnnotationCollector::_unknown)  continue;
     coll->set_annotation(id);
 
-    if (id == AnnotationCollector::_sun_misc_Contended) {
+    if (id == AnnotationCollector::_jdk_internal_vm_annotation_Contended) {
       // @Contended can optionally specify the contention group.
       //
       // Contended group defines the equivalence class over the fields:
@@ -1767,10 +1767,10 @@
     if (_location != _in_field)   break;  // only allow for fields
     if (!privileged)              break;  // only allow in privileged code
     return _field_Stable;
-  case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_misc_Contended_signature):
+  case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Contended_signature):
     if (_location != _in_field && _location != _in_class)          break;  // only allow for fields and classes
     if (!EnableContended || (RestrictContended && !privileged))    break;  // honor privileges
-    return _sun_misc_Contended;
+    return _jdk_internal_vm_annotation_Contended;
   default: break;
   }
   return AnnotationCollector::_unknown;

--- a/hotspot/src/share/vm/classfile/classFileParser.hpp	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp	Tue Nov 24 11:49:44 2015 +0000
@@ -131,7 +131,7 @@
       _method_LambdaForm_Compiled,
       _method_LambdaForm_Hidden,
       _method_HotSpotIntrinsicCandidate,
-      _sun_misc_Contended,
+      _jdk_internal_vm_annotation_Contended,
       _field_Stable,
       _annotation_LIMIT
     };
@@ -164,7 +164,7 @@
     void set_contended_group(u2 group) { _contended_group = group; }
     u2 contended_group() const { return _contended_group; }
 
-    bool is_contended() const { return has_annotation(_sun_misc_Contended); }
+    bool is_contended() const { return has_annotation(_jdk_internal_vm_annotation_Contended); }
 
     void set_stable(bool stable) { set_annotation(_field_Stable); }
     bool is_stable() const { return has_annotation(_field_Stable); }

--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp	Tue Nov 24 11:49:44 2015 +0000
@@ -210,7 +210,7 @@
   template(java_util_concurrent_atomic_AtomicLongFieldUpdater_CASUpdater,    "java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater") \
   template(java_util_concurrent_atomic_AtomicLongFieldUpdater_LockedUpdater, "java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater") \
   template(java_util_concurrent_atomic_AtomicReferenceFieldUpdater_Impl,     "java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl") \
-  template(sun_misc_Contended_signature,              "Lsun/misc/Contended;")                     \
+  template(jdk_internal_vm_annotation_Contended_signature,                   "Ljdk/internal/vm/annotation/Contended;")    \
                                                                                                   \
   /* class symbols needed by intrinsics */                                                        \
   VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, template, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \

--- a/hotspot/test/runtime/contended/Basic.java	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/test/runtime/contended/Basic.java	Tue Nov 24 11:49:44 2015 +0000
@@ -36,7 +36,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import sun.misc.Unsafe;
-import sun.misc.Contended;
+import jdk.internal.vm.annotation.Contended;
 
 /*
  * @test

--- a/hotspot/test/runtime/contended/DefaultValue.java	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/test/runtime/contended/DefaultValue.java	Tue Nov 24 11:49:44 2015 +0000
@@ -36,7 +36,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import sun.misc.Unsafe;
-import sun.misc.Contended;
+import jdk.internal.vm.annotation.Contended;
 
 /*
  * @test

--- a/hotspot/test/runtime/contended/HasNonStatic.java	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/test/runtime/contended/HasNonStatic.java	Tue Nov 24 11:49:44 2015 +0000
@@ -36,7 +36,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import sun.misc.Unsafe;
-import sun.misc.Contended;
+import jdk.internal.vm.annotation.Contended;
 
 /*
  * @test

--- a/hotspot/test/runtime/contended/Inheritance1.java	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/test/runtime/contended/Inheritance1.java	Tue Nov 24 11:49:44 2015 +0000
@@ -36,7 +36,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import sun.misc.Unsafe;
-import sun.misc.Contended;
+import jdk.internal.vm.annotation.Contended;
 
 /*
  * @test

--- a/hotspot/test/runtime/contended/OopMaps.java	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/test/runtime/contended/OopMaps.java	Tue Nov 24 11:49:44 2015 +0000
@@ -36,7 +36,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import sun.misc.Unsafe;
-import sun.misc.Contended;
+import jdk.internal.vm.annotation.Contended;
 
 /*
  * @test

--- a/hotspot/test/runtime/contended/OopMapsSameGroup.java	Tue Nov 24 09:02:26 2015 +0000
+++ b/hotspot/test/runtime/contended/OopMapsSameGroup.java	Tue Nov 24 11:49:44 2015 +0000
@@ -36,7 +36,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import sun.misc.Unsafe;
-import sun.misc.Contended;
+import jdk.internal.vm.annotation.Contended;
 
 /*
  * @test