--- old/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp	2017-11-03 14:43:20.528587783 +0100
+++ new/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp	2017-11-03 14:43:20.131575549 +0100
@@ -182,19 +182,19 @@
             "min yellow size: " SIZE_FORMAT,
             green_zone, yellow_zone, red_zone, min_yellow_zone_size);
 
-  G1ConcurrentRefine* cg1r = new G1ConcurrentRefine(green_zone,
-                                                    yellow_zone,
-                                                    red_zone,
-                                                    min_yellow_zone_size);
+  G1ConcurrentRefine* cr = new G1ConcurrentRefine(green_zone,
+                                                  yellow_zone,
+                                                  red_zone,
+                                                  min_yellow_zone_size);
 
-  if (cg1r == NULL) {
+  if (cr == NULL) {
     *ecode = JNI_ENOMEM;
     vm_shutdown_during_initialization("Could not create G1ConcurrentRefine");
     return NULL;
   }
 
-  cg1r->_threads = NEW_C_HEAP_ARRAY_RETURN_NULL(G1ConcurrentRefineThread*, cg1r->_n_worker_threads, mtGC);
-  if (cg1r->_threads == NULL) {
+  cr->_threads = NEW_C_HEAP_ARRAY_RETURN_NULL(G1ConcurrentRefineThread*, cr->_n_worker_threads, mtGC);
+  if (cr->_threads == NULL) {
     *ecode = JNI_ENOMEM;
     vm_shutdown_during_initialization("Could not allocate an array for G1ConcurrentRefineThread");
     return NULL;
@@ -203,10 +203,10 @@
   uint worker_id_offset = DirtyCardQueueSet::num_par_ids();
 
   G1ConcurrentRefineThread *next = NULL;
-  for (uint i = cg1r->_n_worker_threads - 1; i != UINT_MAX; i--) {
+  for (uint i = cr->_n_worker_threads - 1; i != UINT_MAX; i--) {
     Thresholds thresholds = calc_thresholds(green_zone, yellow_zone, i);
     G1ConcurrentRefineThread* t =
-      new G1ConcurrentRefineThread(cg1r,
+      new G1ConcurrentRefineThread(cr,
                                    next,
                                    worker_id_offset,
                                    i,
@@ -219,20 +219,20 @@
       return NULL;
     }
 
-    assert(t->cg1r() == cg1r, "Conc refine thread should refer to this");
-    cg1r->_threads[i] = t;
+    assert(t->cr() == cr, "Conc refine thread should refer to this");
+    cr->_threads[i] = t;
     next = t;
   }
 
-  cg1r->_sample_thread = new G1YoungRemSetSamplingThread();
-  if (cg1r->_sample_thread->osthread() == NULL) {
+  cr->_sample_thread = new G1YoungRemSetSamplingThread();
+  if (cr->_sample_thread->osthread() == NULL) {
     *ecode = JNI_ENOMEM;
     vm_shutdown_during_initialization("Could not create G1YoungRemSetSamplingThread");
     return NULL;
   }
 
   *ecode = JNI_OK;
-  return cg1r;
+  return cr;
 }
 
 void G1ConcurrentRefine::stop() {