--- a/hotspot/src/share/vm/code/nmethod.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/code/nmethod.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -692,7 +692,7 @@
   _native_basic_lock_sp_offset(basic_lock_sp_offset)
 {
   {
-    debug_only(No_Safepoint_Verifier nsv;)
+    debug_only(NoSafepointVerifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
     init_defaults();
@@ -796,7 +796,7 @@
 {
   assert(debug_info->oop_recorder() == code_buffer->oop_recorder(), "shared OR");
   {
-    debug_only(No_Safepoint_Verifier nsv;)
+    debug_only(NoSafepointVerifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
     init_defaults();
@@ -1404,7 +1404,7 @@
   // Make sure neither the nmethod nor the method is flushed in case of a safepoint in code below.
   nmethodLocker nml(this);
   methodHandle the_method(method());
-  No_Safepoint_Verifier nsv;
+  NoSafepointVerifier nsv;
 
   // during patching, depending on the nmethod state we must notify the GC that
   // code has been unloaded, unregistering it. We cannot do this right while