--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2015-03-04 13:52:17.987990177 +0100
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2015-03-04 13:52:17.916988066 +0100
@@ -184,12 +184,12 @@
   friend class MutatorAllocRegion;
   friend class SurvivorGCAllocRegion;
   friend class OldGCAllocRegion;
-  friend class G1Allocator;
+  friend class AllocRegionManager;
 
   // Closures used in implementation.
   friend class G1ParScanThreadState;
   friend class G1ParTask;
-  friend class G1ParGCAllocator;
+  friend class PLABAllocator;
   friend class G1PrepareCompactClosure;
 
   // Other related classes.
@@ -246,8 +246,8 @@
   // The sequence of all heap regions in the heap.
   HeapRegionManager _hrm;
 
-  // Class that handles the different kinds of allocations.
-  G1Allocator* _allocator;
+  // Handles the different kinds of allocations within a region.
+  AllocRegionManager* _allocator;
 
   // Statistics for each allocation context
   AllocationContextStats _allocation_context_stats;
@@ -604,7 +604,7 @@
 
 public:
 
-  G1Allocator* allocator() {
+  AllocRegionManager* allocator() {
     return _allocator;
   }