--- old/src/share/vm/gc/g1/g1ParScanThreadState.hpp	2015-10-08 16:32:37.649858558 +0200
+++ new/src/share/vm/gc/g1/g1ParScanThreadState.hpp	2015-10-08 16:32:37.493852105 +0200
@@ -30,7 +30,7 @@
 #include "gc/g1/g1CollectorPolicy.hpp"
 #include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/g1RemSet.hpp"
-#include "gc/g1/g1RootClosureSet.hpp"
+#include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1SATBCardTableModRefBS.hpp"
 #include "gc/shared/ageTable.hpp"
 #include "memory/allocation.hpp"
@@ -46,7 +46,7 @@
   RefToScanQueue*  _refs;
   DirtyCardQueue   _dcq;
   G1SATBCardTableModRefBS* _ct_bs;
-  G1EvacuationRootClosureSet* _closures;
+  G1EvacuationRootClosures* _closures;
 
   G1PLABAllocator*  _plab_allocator;
 
@@ -82,7 +82,7 @@
     return _dest[original.value()];
   }
 
-  G1EvacuationRootClosureSet* new_root_closure_set();
+  G1EvacuationRootClosures* new_root_closures();
  public:
   G1ParScanThreadState(G1CollectedHeap* g1h, uint worker_id, size_t young_cset_length);
   ~G1ParScanThreadState();
@@ -111,7 +111,7 @@
     }
   }
 
-  G1EvacuationRootClosureSet* closures() { return _closures; }
+  G1EvacuationRootClosures* closures() { return _closures; }
   uint worker_id() { return _worker_id; }
 
   // Returns the current amount of waste due to alignment or not being able to fit