--- a/hotspot/src/share/vm/oops/method.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/oops/method.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -77,7 +77,7 @@
 }
 
 Method::Method(ConstMethod* xconst, AccessFlags access_flags) {
-  No_Safepoint_Verifier no_safepoint;
+  NoSafepointVerifier no_safepoint;
   set_constMethod(xconst);
   set_access_flags(access_flags);
 #ifdef CC_INTERP
@@ -998,7 +998,7 @@
 // or adapter that it points to is still live and valid.
 // This function must not hit a safepoint!
 address Method::verified_code_entry() {
-  debug_only(No_Safepoint_Verifier nsv;)
+  debug_only(NoSafepointVerifier nsv;)
   assert(_from_compiled_entry != NULL, "must be set");
   return _from_compiled_entry;
 }
@@ -1548,7 +1548,7 @@
   int length = methods->length();
   if (length > 1) {
     {
-      No_Safepoint_Verifier nsv;
+      NoSafepointVerifier nsv;
       QuickSort::sort<Method*>(methods->data(), length, method_comparator, idempotent);
     }
     // Reset method ordering