--- old/src/share/vm/gc/g1/g1RootProcessor.hpp	2015-10-08 16:32:39.233924078 +0200
+++ new/src/share/vm/gc/g1/g1RootProcessor.hpp	2015-10-08 16:32:39.089918122 +0200
@@ -34,8 +34,8 @@
 class G1CollectedHeap;
 class G1GCPhaseTimes;
 class G1ParPushHeapRSClosure;
-class G1EvacuationRootClosureSet;
-class G1RootClosureSet;
+class G1EvacuationRootClosures;
+class G1RootClosures;
 class Monitor;
 class OopClosure;
 class SubTasksDone;
@@ -73,11 +73,11 @@
   void worker_has_discovered_all_strong_classes();
   void wait_until_all_strong_classes_discovered();
 
-  void process_java_roots(G1RootClosureSet* closures,
+  void process_java_roots(G1RootClosures* closures,
                           G1GCPhaseTimes* phase_times,
                           uint worker_i);
 
-  void process_vm_roots(G1RootClosureSet* closures,
+  void process_vm_roots(G1RootClosures* closures,
                         G1GCPhaseTimes* phase_times,
                         uint worker_i);
 
@@ -87,7 +87,7 @@
   // Apply closures to the strongly and weakly reachable roots in the system
   // in a single pass.
   // Record and report timing measurements for sub phases using the worker_i
-  void evacuate_roots(G1EvacuationRootClosureSet* closures, bool trace_metadata, uint worker_i);
+  void evacuate_roots(G1EvacuationRootClosures* closures, bool trace_metadata, uint worker_i);
 
   // Apply oops, clds and blobs to all strongly reachable roots in the system
   void process_strong_roots(OopClosure* oops,