--- old/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	2019-02-27 13:50:41.259346929 +0100
+++ new/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	2019-02-27 13:50:40.982338507 +0100
@@ -2332,8 +2332,8 @@
   return _cm_thread->request_concurrent_phase(phase);
 }
 
-bool G1CollectedHeap::is_hetero_heap() const {
-  return _collector_policy->is_hetero_heap();
+bool G1CollectedHeap::is_heterogeneous_heap() const {
+  return _collector_policy->is_heterogeneous_heap();
 }
 
 class PrintRegionClosure: public HeapRegionClosure {
--- old/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	2019-02-27 13:50:42.497384572 +0100
+++ new/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	2019-02-27 13:50:42.226376332 +0100
@@ -1366,7 +1366,7 @@
   // WhiteBox testing support.
   virtual bool supports_concurrent_phase_control() const;
   virtual bool request_concurrent_phase(const char* phase);
-  bool is_hetero_heap() const;
+  bool is_heterogeneous_heap() const;
 
   virtual WorkGang* get_safepoint_workers() { return _workers; }
 
--- old/src/hotspot/share/gc/g1/g1CollectorPolicy.cpp	2019-02-27 13:50:43.658419874 +0100
+++ new/src/hotspot/share/gc/g1/g1CollectorPolicy.cpp	2019-02-27 13:50:43.383411512 +0100
@@ -60,6 +60,6 @@
   return _max_heap_byte_size;
 }
 
-bool G1CollectorPolicy::is_hetero_heap() const {
+bool G1CollectorPolicy::is_heterogeneous_heap() const {
   return false;
 }
--- old/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp	2019-02-27 13:50:44.792454355 +0100
+++ new/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp	2019-02-27 13:50:44.522446145 +0100
@@ -39,6 +39,6 @@
 public:
   G1CollectorPolicy();
   virtual size_t heap_reserved_size_bytes() const;
-  virtual bool is_hetero_heap() const;
+  virtual bool is_heterogeneous_heap() const;
 };
 #endif // SHARE_GC_G1_G1COLLECTORPOLICY_HPP
--- old/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.cpp	2019-02-27 13:50:47.424534384 +0100
+++ new/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.cpp	2019-02-27 13:50:47.154526174 +0100
@@ -98,6 +98,6 @@
     return 2 * _max_heap_byte_size;
 }
 
-bool G1HeterogeneousCollectorPolicy::is_hetero_heap() const {
+bool G1HeterogeneousCollectorPolicy::is_heterogeneous_heap() const {
   return true;
 }
--- old/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp	2019-02-27 13:50:48.593569929 +0100
+++ new/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp	2019-02-27 13:50:48.322561689 +0100
@@ -41,7 +41,7 @@
 public:
   G1HeterogeneousCollectorPolicy() {}
   virtual size_t heap_reserved_size_bytes() const;
-  virtual bool is_hetero_heap() const;
+  virtual bool is_heterogeneous_heap() const;
   static size_t reasonable_max_memory_for_young();
 };
 
--- old/src/hotspot/share/gc/g1/g1Policy.cpp	2019-02-27 13:50:49.735604653 +0100
+++ new/src/hotspot/share/gc/g1/g1Policy.cpp	2019-02-27 13:50:49.461596321 +0100
@@ -90,7 +90,7 @@
 }
 
 G1Policy* G1Policy::create_policy(G1CollectorPolicy* policy, STWGCTimer* gc_timer_stw) {
-  if (policy->is_hetero_heap()) {
+  if (policy->is_heterogeneous_heap()) {
     return new G1HeterogeneousHeapPolicy(policy, gc_timer_stw);
   } else {
     return new G1Policy(policy, gc_timer_stw);
--- old/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp	2019-02-27 13:50:56.441808557 +0100
+++ new/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp	2019-02-27 13:50:56.170800317 +0100
@@ -131,7 +131,7 @@
 }
 
 G1YoungGenSizer* G1YoungGenSizer::create_gen_sizer(G1CollectorPolicy* policy) {
-  if (policy->is_hetero_heap()) {
+  if (policy->is_heterogeneous_heap()) {
     return new G1HeterogeneousHeapYoungGenSizer();
   } else {
     return new G1YoungGenSizer();
--- old/src/hotspot/share/gc/g1/heapRegionManager.cpp	2019-02-27 13:50:57.592843554 +0100
+++ new/src/hotspot/share/gc/g1/heapRegionManager.cpp	2019-02-27 13:50:57.319835253 +0100
@@ -69,7 +69,7 @@
 { }
 
 HeapRegionManager* HeapRegionManager::create_manager(G1CollectedHeap* heap, G1CollectorPolicy* policy) {
-  if (policy->is_hetero_heap()) {
+  if (policy->is_heterogeneous_heap()) {
     return new HeterogeneousHeapRegionManager((uint)(policy->max_heap_byte_size() / HeapRegion::GrainBytes) /*heap size as num of regions*/);
   }
   return new HeapRegionManager();
--- old/src/hotspot/share/prims/whitebox.cpp	2019-02-27 13:50:58.758879008 +0100
+++ new/src/hotspot/share/prims/whitebox.cpp	2019-02-27 13:50:58.483870646 +0100
@@ -483,7 +483,7 @@
 #if INCLUDE_G1GC
   if (UseG1GC) {
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
-    if (g1h->is_hetero_heap()) {
+    if (g1h->is_heterogeneous_heap()) {
       uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_dram();
       return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
     } else {
@@ -509,7 +509,7 @@
 #if INCLUDE_G1GC
   if (UseG1GC) {
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
-    if (g1h->is_hetero_heap()) {
+    if (g1h->is_heterogeneous_heap()) {
       uint end_region = HeterogeneousHeapRegionManager::manager()->end_index_of_dram();
       return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
     } else {
@@ -535,7 +535,7 @@
 #if INCLUDE_G1GC
   if (UseG1GC) {
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
-    if (g1h->is_hetero_heap()) {
+    if (g1h->is_heterogeneous_heap()) {
       uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
       return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
     } else {
@@ -561,7 +561,7 @@
 #if INCLUDE_G1GC
   if (UseG1GC) {
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
-    if (g1h->is_hetero_heap()) {
+    if (g1h->is_heterogeneous_heap()) {
       uint end_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
       return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
     } else {