--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	Fri Mar 16 14:47:53 2018 +0100
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	Mon Mar 19 07:38:18 2018 +0100
@@ -71,7 +71,7 @@
 
   PSCardTable* card_table = new PSCardTable(reserved_region());
   card_table->initialize();
-  CardTableModRefBS* const barrier_set = new CardTableModRefBS(card_table);
+  CardTableBarrierSet* const barrier_set = new CardTableBarrierSet(card_table);
   barrier_set->initialize();
   set_barrier_set(barrier_set);
 
@@ -626,8 +626,8 @@
   return (ParallelScavengeHeap*)heap;
 }
 
-CardTableModRefBS* ParallelScavengeHeap::barrier_set() {
-  return barrier_set_cast<CardTableModRefBS>(CollectedHeap::barrier_set());
+CardTableBarrierSet* ParallelScavengeHeap::barrier_set() {
+  return barrier_set_cast<CardTableBarrierSet>(CollectedHeap::barrier_set());
 }
 
 PSCardTable* ParallelScavengeHeap::card_table() {