diff -r 663c609dfeee -r c8c0273e6b91 hotspot/src/share/vm/runtime/interfaceSupport.hpp
--- a/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Thu Jan 14 13:26:19 2016 +0100
@@ -451,7 +451,7 @@
 #define IRT_LEAF(result_type, header)                                \
   result_type header {                                               \
     VM_LEAF_BASE(result_type, header)                                \
-    debug_only(No_Safepoint_Verifier __nspv(true);)
+    debug_only(NoSafepointVerifier __nspv(true);)
 
 
 #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
@@ -475,7 +475,7 @@
 #define JRT_LEAF(result_type, header)                                \
   result_type header {                                               \
   VM_LEAF_BASE(result_type, header)                                  \
-  debug_only(JRT_Leaf_Verifier __jlv;)
+  debug_only(JRTLeafVerifier __jlv;)
 
 
 #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \