--- old/src/share/vm/gc/g1/g1HeapTransition.cpp	2016-02-02 11:05:56.182605935 +0100
+++ new/src/share/vm/gc/g1/g1HeapTransition.cpp	2016-02-02 11:05:56.062605930 +0100
@@ -40,7 +40,7 @@
 
 G1HeapTransition::G1HeapTransition(G1CollectedHeap* g1_heap) : _g1_heap(g1_heap), _before(g1_heap) { }
 
-struct SeparatedUsageInfo : public StackObj {
+struct DetailedUsage : public StackObj {
   size_t _eden_used;
   size_t _survivor_used;
   size_t _old_used;
@@ -51,27 +51,27 @@
   size_t _old_region_count;
   size_t _humongous_region_count;
 
-  SeparatedUsageInfo() :
+  DetailedUsage() :
     _eden_used(0), _survivor_used(0), _old_used(0), _humongous_used(0),
     _eden_region_count(0), _survivor_region_count(0), _old_region_count(0), _humongous_region_count(0) {}
 };
 
-class SumSeparatedUsedClosure: public HeapRegionClosure {
+class DetailedUsageClosure: public HeapRegionClosure {
 public:
-  SeparatedUsageInfo _info;
+  DetailedUsage _usage;
   bool doHeapRegion(HeapRegion* r) {
     if (r->is_old()) {
-      _info._old_used += r->used();
-      _info._old_region_count++;
+      _usage._old_used += r->used();
+      _usage._old_region_count++;
     } else if (r->is_survivor()) {
-      _info._survivor_used += r->used();
-      _info._survivor_region_count++;
+      _usage._survivor_used += r->used();
+      _usage._survivor_region_count++;
     } else if (r->is_eden()) {
-      _info._eden_used += r->used();
-      _info._eden_region_count++;
+      _usage._eden_used += r->used();
+      _usage._eden_region_count++;
     } else if (r->is_humongous()) {
-      _info._humongous_used += r->used();
-      _info._humongous_region_count++;
+      _usage._humongous_used += r->used();
+      _usage._humongous_region_count++;
     } else {
       assert(r->used() == 0, "Expected used to be 0 but it was " SIZE_FORMAT, r->used());
     }
@@ -85,18 +85,18 @@
   size_t eden_capacity_bytes_after_gc = _g1_heap->g1_policy()->young_list_target_length() - after._survivor_length;
   size_t survivor_capacity_bytes_after_gc = _g1_heap->g1_policy()->max_survivor_regions();
 
-  SeparatedUsageInfo usage_info;
+  DetailedUsage usage;
   if (log_is_enabled(Trace, gc, heap)) {
-    SumSeparatedUsedClosure blk;
+    DetailedUsageClosure blk;
     _g1_heap->heap_region_iterate(&blk);
-    usage_info = blk._info;
-    assert(usage_info._eden_region_count == 0, "Expected no eden regions, but got " SIZE_FORMAT, usage_info._eden_region_count);
-    assert(usage_info._survivor_region_count == after._survivor_length, "Expected survivors to be " SIZE_FORMAT " but was " SIZE_FORMAT,
-        after._survivor_length, usage_info._survivor_region_count);
-    assert(usage_info._old_region_count == after._old_length, "Expected old to be " SIZE_FORMAT " but was " SIZE_FORMAT,
-        after._old_length, usage_info._old_region_count);
-    assert(usage_info._humongous_region_count == after._humongous_length, "Expected humongous to be " SIZE_FORMAT " but was " SIZE_FORMAT,
-        after._humongous_length, usage_info._humongous_region_count);
+    usage = blk._usage;
+    assert(usage._eden_region_count == 0, "Expected no eden regions, but got " SIZE_FORMAT, usage._eden_region_count);
+    assert(usage._survivor_region_count == after._survivor_length, "Expected survivors to be " SIZE_FORMAT " but was " SIZE_FORMAT,
+        after._survivor_length, usage._survivor_region_count);
+    assert(usage._old_region_count == after._old_length, "Expected old to be " SIZE_FORMAT " but was " SIZE_FORMAT,
+        after._old_length, usage._old_region_count);
+    assert(usage._humongous_region_count == after._humongous_length, "Expected humongous to be " SIZE_FORMAT " but was " SIZE_FORMAT,
+        after._humongous_length, usage._humongous_region_count);
   }
 
   log_info(gc, heap)("Eden regions: " SIZE_FORMAT "->" SIZE_FORMAT "("  SIZE_FORMAT ")",
@@ -106,17 +106,17 @@
   log_info(gc, heap)("Survivor regions: " SIZE_FORMAT "->" SIZE_FORMAT "("  SIZE_FORMAT ")",
                      _before._survivor_length, after._survivor_length, survivor_capacity_bytes_after_gc);
   log_trace(gc, heap)(" Used: " SIZE_FORMAT "K, Waste: " SIZE_FORMAT "K",
-      usage_info._survivor_used / K, ((after._survivor_length * HeapRegion::GrainBytes) - usage_info._survivor_used) / K);
+      usage._survivor_used / K, ((after._survivor_length * HeapRegion::GrainBytes) - usage._survivor_used) / K);
 
   log_info(gc, heap)("Old regions: " SIZE_FORMAT "->" SIZE_FORMAT,
                      _before._old_length, after._old_length);
   log_trace(gc, heap)(" Used: " SIZE_FORMAT "K, Waste: " SIZE_FORMAT "K",
-      usage_info._old_used / K, ((after._old_length * HeapRegion::GrainBytes) - usage_info._old_used) / K);
+      usage._old_used / K, ((after._old_length * HeapRegion::GrainBytes) - usage._old_used) / K);
 
   log_info(gc, heap)("Humongous regions: " SIZE_FORMAT "->" SIZE_FORMAT,
                      _before._humongous_length, after._humongous_length);
   log_trace(gc, heap)(" Used: " SIZE_FORMAT "K, Waste: " SIZE_FORMAT "K",
-      usage_info._humongous_used / K, ((after._humongous_length * HeapRegion::GrainBytes) - usage_info._humongous_used) / K);
+      usage._humongous_used / K, ((after._humongous_length * HeapRegion::GrainBytes) - usage._humongous_used) / K);
 
   MetaspaceAux::print_metaspace_change(_before._metaspace_used_bytes);
 }