--- old/src/hotspot/share/gc/g1/g1CollectionSet.hpp	2018-03-29 16:11:53.531666411 +0200
+++ new/src/hotspot/share/gc/g1/g1CollectionSet.hpp	2018-03-29 16:11:53.270658377 +0200
@@ -37,7 +37,7 @@
 class HeapRegion;
 
 class G1CollectionSet {
-  G1CollectedHeap* _g1;
+  G1CollectedHeap* _g1h;
   G1Policy* _policy;
 
   CollectionSetChooser* _cset_chooser;