--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp	Mon Jan 04 15:41:05 2016 +0100
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp	Thu Jan 14 16:26:38 2016 -0500
@@ -574,9 +574,9 @@
   // actual ClassLoaderData object.
   ClassLoaderData::Dependencies dependencies(CHECK_NULL);
 
-  No_Safepoint_Verifier no_safepoints; // we mustn't GC until we've installed the
-                                       // ClassLoaderData in the graph since the CLD
-                                       // contains unhandled oops
+  NoSafepointVerifier no_safepoints; // we mustn't GC until we've installed the
+                                     // ClassLoaderData in the graph since the CLD
+                                     // contains unhandled oops
 
   ClassLoaderData* cld = new ClassLoaderData(loader, is_anonymous, dependencies);