--- old/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp	2017-11-03 14:43:23.473678542 +0100
+++ new/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp	2017-11-03 14:43:23.076666308 +0100
@@ -49,7 +49,7 @@
   bool _active;
   G1ConcurrentRefineThread* _next;
   Monitor* _monitor;
-  G1ConcurrentRefine* _cg1r;
+  G1ConcurrentRefine* _cr;
 
   // This thread's activation/deactivation thresholds
   size_t _activation_threshold;
@@ -69,7 +69,7 @@
 
 public:
   // Constructor
-  G1ConcurrentRefineThread(G1ConcurrentRefine* cg1r, G1ConcurrentRefineThread* next,
+  G1ConcurrentRefineThread(G1ConcurrentRefine* cr, G1ConcurrentRefineThread* next,
                            uint worker_id_offset, uint worker_id,
                            size_t activate, size_t deactivate);
 
@@ -79,7 +79,7 @@
   // Total virtual time so far.
   double vtime_accum() { return _vtime_accum; }
 
-  G1ConcurrentRefine* cg1r() { return _cg1r;     }
+  G1ConcurrentRefine* cr() { return _cr;     }
 };
 
 #endif // SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP