diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index 9212e2c..6f0ae81 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/shared/cardTableModRefBSCodeGen.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
@@ -40,17 +40,17 @@
 // enumerate ref fields that have been modified (since the last
 // enumeration.)
 
-CardTableBarrierSet::CardTableBarrierSet(BarrierSetCodeGen* code_gen,
+CardTableBarrierSet::CardTableBarrierSet(BarrierSetAssembler* barrier_set_assembler,
                                          CardTable* card_table,
                                          const BarrierSet::FakeRtti& fake_rtti) :
-  ModRefBarrierSet(code_gen,
+  ModRefBarrierSet(barrier_set_assembler,
                    fake_rtti.add_tag(BarrierSet::CardTableBarrierSet)),
   _defer_initial_card_mark(false),
   _card_table(card_table)
 {}
 
 CardTableBarrierSet::CardTableBarrierSet(CardTable* card_table) :
-  ModRefBarrierSet(make_code_gen<CardTableModRefBSCodeGen>(),
+  ModRefBarrierSet(make_barrier_set_assembler<CardTableBarrierSetAssembler>(),
                    BarrierSet::FakeRtti(BarrierSet::CardTableBarrierSet)),
   _defer_initial_card_mark(false),
   _card_table(card_table)