--- a/hotspot/src/share/vm/runtime/thread.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -2440,7 +2440,7 @@
 // normal checks but also performs the transition back into
 // thread_in_Java state.  This is required so that critical natives
 // can potentially block and perform a GC if they are the last thread
-// exiting the GC_locker.
+// exiting the GCLocker.
 void JavaThread::check_special_condition_for_native_trans_and_transition(JavaThread *thread) {
   check_special_condition_for_native_trans(thread);
 
@@ -2449,7 +2449,7 @@
 
   if (thread->do_critical_native_unlock()) {
     ThreadInVMfromJavaNoAsyncException tiv(thread);
-    GC_locker::unlock_critical(thread);
+    GCLocker::unlock_critical(thread);
     thread->clear_critical_native_unlock();
   }
 }