--- old/src/share/vm/gc/g1/g1EvacuationClosures.hpp	2015-10-08 16:32:35.973789232 +0200
+++ new/src/share/vm/gc/g1/g1EvacuationClosures.hpp	2015-10-08 16:32:35.857784434 +0200
@@ -28,14 +28,14 @@
 #include "gc/g1/bufferingOopClosure.hpp"
 #include "gc/g1/g1CodeBlobClosure.hpp"
 #include "gc/g1/g1OopClosures.hpp"
-#include "gc/g1/g1RootClosureSet.hpp"
+#include "gc/g1/g1RootClosures.hpp"
 
 class G1CollectedHeap;
 class G1ParScanThreadState;
 
 // Simple holder object for a complete set of closures used by the G1 evacuation code.
 template <G1Mark Mark>
-class G1ClosureSet VALUE_OBJ_CLASS_SPEC {
+class G1SharedClosures VALUE_OBJ_CLASS_SPEC {
 public:
   G1ParCopyClosure<G1BarrierNone, Mark> _oops;
   G1ParCopyClosure<G1BarrierKlass, Mark> _oop_in_klass;
@@ -44,7 +44,7 @@
   G1CodeBlobClosure _codeblobs;
   BufferingOopClosure _buffered_oops;
 
-  G1ClosureSet(G1CollectedHeap* g1h, G1ParScanThreadState* pss, bool process_only_dirty_klasses, bool must_claim_cld) :
+  G1SharedClosures(G1CollectedHeap* g1h, G1ParScanThreadState* pss, bool process_only_dirty_klasses, bool must_claim_cld) :
     _oops(g1h, pss),
     _oop_in_klass(g1h, pss),
     _klass_in_cld_closure(&_oop_in_klass, process_only_dirty_klasses),
@@ -53,8 +53,8 @@
     _buffered_oops(&_oops) {}
 };
 
-class G1EvacuationClosures : public G1EvacuationRootClosureSet {
-  G1ClosureSet<G1MarkNone> _closures;
+class G1EvacuationClosures : public G1EvacuationRootClosures {
+  G1SharedClosures<G1MarkNone> _closures;
 
 public:
   G1EvacuationClosures(G1CollectedHeap* g1h,
@@ -85,9 +85,9 @@
 // The treatment of "weak" roots is selectable through the template parameter,
 // this is usually used to control unloading of classes and interned strings.
 template <G1Mark MarkWeak>
-class G1InitalMarkClosures : public G1EvacuationRootClosureSet {
-  G1ClosureSet<G1MarkFromRoot> _strong;
-  G1ClosureSet<MarkWeak>       _weak;
+class G1InitalMarkClosures : public G1EvacuationRootClosures {
+  G1SharedClosures<G1MarkFromRoot> _strong;
+  G1SharedClosures<MarkWeak>       _weak;
 
   // Filter method to help with returning the appropriate closures
   // depending on the class template parameter.