--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Fri May 17 12:06:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Fri May 17 12:33:37 2019 +0200
@@ -3575,7 +3575,7 @@
   _allocator->init_gc_alloc_regions(evacuation_info);
 
   register_regions_with_region_attr();
-  assert(_verifier->check_cset_fast_test(), "Inconsistency in the InCSetState table.");
+  assert(_verifier->check_region_attr_table(), "Inconsistency in the region attributes table.");
 
   rem_set()->prepare_for_scan_rem_set();
   _preserved_marks_set.assert_empty();

--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Fri May 17 12:06:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Fri May 17 12:33:37 2019 +0200
@@ -149,7 +149,7 @@
   friend class HeapRegionClaimer;
 
   // Testing classes.
-  friend class G1CheckCSetFastTableClosure;
+  friend class G1CheckRegionAttrTableClosure;
 
 private:
   G1YoungRemSetSamplingThread* _young_gen_sampling_thread;

--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Fri May 17 12:06:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Fri May 17 12:33:37 2019 +0200
@@ -296,7 +296,7 @@
 inline void G1CollectedHeap::set_humongous_is_live(oop obj) {
   uint region = addr_to_region((HeapWord*)obj);
   // Clear the flag in the humongous_reclaim_candidates table.  Also
-  // reset the entry in the _in_cset_fast_test table so that subsequent references
+  // reset the entry in the region attribute table so that subsequent references
   // to the same humongous object do not go into the slow path again.
   // This is racy, as multiple threads may at the same time enter here, but this
   // is benign.

--- a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp	Fri May 17 12:06:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp	Fri May 17 12:33:37 2019 +0200
@@ -782,11 +782,12 @@
   guarantee(!cl.failures(), "bitmap verification");
 }
 
-class G1CheckCSetFastTableClosure : public HeapRegionClosure {
- private:
+class G1CheckRegionAttrTableClosure : public HeapRegionClosure {
+private:
   bool _failures;
- public:
-  G1CheckCSetFastTableClosure() : HeapRegionClosure(), _failures(false) { }
+
+public:
+  G1CheckRegionAttrTableClosure() : HeapRegionClosure(), _failures(false) { }
 
   virtual bool do_heap_region(HeapRegion* hr) {
     uint i = hr->hrm_index();
@@ -845,8 +846,8 @@
   bool failures() const { return _failures; }
 };
 
-bool G1HeapVerifier::check_cset_fast_test() {
-  G1CheckCSetFastTableClosure cl;
+bool G1HeapVerifier::check_region_attr_table() {
+  G1CheckRegionAttrTableClosure cl;
   _g1h->_hrm->iterate(&cl);
   return !cl.failures();
 }

--- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Fri May 17 12:06:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Fri May 17 12:33:37 2019 +0200
@@ -107,7 +107,7 @@
   void check_bitmaps(const char* caller) PRODUCT_RETURN;
 
   // Do sanity check on the contents of the in-cset fast test table.
-  bool check_cset_fast_test() PRODUCT_RETURN_( return true; );
+  bool check_region_attr_table() PRODUCT_RETURN_( return true; );
 
   void verify_card_table_cleanup() PRODUCT_RETURN;