--- a/hotspot/src/share/vm/gc/cms/cmsOopClosures.inline.hpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/gc/cms/cmsOopClosures.inline.hpp	Thu Jan 14 13:26:19 2016 +0100
@@ -31,7 +31,7 @@
 #include "oops/oop.inline.hpp"
 
 // Trim our work_queue so its length is below max at return
-inline void Par_MarkRefsIntoAndScanClosure::trim_queue(uint max) {
+inline void ParMarkRefsIntoAndScanClosure::trim_queue(uint max) {
   while (_work_queue->size() > max) {
     oop newOop;
     if (_work_queue->pop_local(newOop)) {
@@ -40,7 +40,7 @@
              "only grey objects on this stack");
       // iterate over the oops in this oop, marking and pushing
       // the ones in CMS heap (i.e. in _span).
-      newOop->oop_iterate(&_par_pushAndMarkClosure);
+      newOop->oop_iterate(&_parPushAndMarkClosure);
     }
   }
 }