--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp	Wed Jul 05 21:31:37 2017 +0200
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp	Sun Apr 03 16:28:47 2016 +0100
@@ -655,7 +655,7 @@
                                                                                                                   \
   /* JVMTI/java.lang.instrument support and VM Attach mechanism */                                                \
   template(jdk_internal_module_Modules,                "jdk/internal/module/Modules")                             \
-  template(sun_misc_VMSupport,                         "sun/misc/VMSupport")                                      \
+  template(jdk_internal_vm_VMSupport,                  "jdk/internal/vm/VMSupport")                               \
   template(transformedByAgent_name,                    "transformedByAgent")                                      \
   template(transformedByAgent_signature,               "(Ljava/lang/reflect/Module;)V")                           \
   template(appendToClassPathForInstrumentation_name,   "appendToClassPathForInstrumentation")                     \

--- a/hotspot/src/share/vm/services/attachListener.cpp	Wed Jul 05 21:31:37 2017 +0200
+++ b/hotspot/src/share/vm/services/attachListener.cpp	Sun Apr 03 16:28:47 2016 +0100
@@ -43,7 +43,7 @@
 
 // Implementation of "properties" command.
 //
-// Invokes sun.misc.VMSupport.serializePropertiesToByteArray to serialize
+// Invokes VMSupport.serializePropertiesToByteArray to serialize
 // the system properties into a byte array.
 
 static Klass* load_and_initialize_klass(Symbol* sh, TRAPS) {
@@ -59,8 +59,8 @@
   Thread* THREAD = Thread::current();
   HandleMark hm;
 
-  // load sun.misc.VMSupport
-  Symbol* klass = vmSymbols::sun_misc_VMSupport();
+  // load VMSupport
+  Symbol* klass = vmSymbols::jdk_internal_vm_VMSupport();
   Klass* k = load_and_initialize_klass(klass, THREAD);
   if (HAS_PENDING_EXCEPTION) {
     java_lang_Throwable::print(PENDING_EXCEPTION, out);

--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp	Wed Jul 05 21:31:37 2017 +0200
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp	Sun Apr 03 16:28:47 2016 +0100
@@ -316,8 +316,8 @@
 }
 
 void PrintSystemPropertiesDCmd::execute(DCmdSource source, TRAPS) {
-  // load sun.misc.VMSupport
-  Symbol* klass = vmSymbols::sun_misc_VMSupport();
+  // load VMSupport
+  Symbol* klass = vmSymbols::jdk_internal_vm_VMSupport();
   Klass* k = SystemDictionary::resolve_or_fail(klass, true, CHECK);
   instanceKlassHandle ik (THREAD, k);
   if (ik->should_be_initialized()) {