diff --git a/src/cndm/rtl/cndm_lite_core.f b/src/cndm/rtl/cndm_lite_core.f
index ee86519..f55b479 100644
--- a/src/cndm/rtl/cndm_lite_core.f
+++ b/src/cndm/rtl/cndm_lite_core.f
@@ -13,7 +13,7 @@ cndm_micro_cpl_wr.sv
 ../lib/taxi/src/dma/rtl/taxi_dma_if_mux.f
 ../lib/taxi/src/dma/rtl/taxi_dma_psdpram.sv
 ../lib/taxi/src/apb/rtl/taxi_apb_if.sv
-../lib/taxi/src/apb/rtl/taxi_apb_interconnect.sv
+../lib/taxi/src/apb/rtl/taxi_apb_interconnect_1s.sv
 ../lib/taxi/src/axi/rtl/taxi_axil_crossbar_1s.f
 ../lib/taxi/src/axi/rtl/taxi_axil_interconnect_1s.f
 ../lib/taxi/src/axis/rtl/taxi_axis_async_fifo_adapter.f
diff --git a/src/cndm/rtl/cndm_lite_core.sv b/src/cndm/rtl/cndm_lite_core.sv
index c04e43b..0cd151b 100644
--- a/src/cndm/rtl/cndm_lite_core.sv
+++ b/src/cndm/rtl/cndm_lite_core.sv
@@ -389,7 +389,7 @@ taxi_apb_if #(
 )
 apb_port_dp_ctrl[PORT_OFFSET_DP+PORTS]();
 
-taxi_apb_interconnect #(
+taxi_apb_interconnect_1s #(
     .M_CNT($size(apb_port_dp_ctrl)),
     .ADDR_W(APB_DP_ADDR_W),
     .M_REGIONS(1),
diff --git a/src/cndm/rtl/cndm_micro_core.f b/src/cndm/rtl/cndm_micro_core.f
index 81ff978..0c59d13 100644
--- a/src/cndm/rtl/cndm_micro_core.f
+++ b/src/cndm/rtl/cndm_micro_core.f
@@ -13,7 +13,7 @@ cndm_micro_cpl_wr.sv
 ../lib/taxi/src/dma/rtl/taxi_dma_if_mux.f
 ../lib/taxi/src/dma/rtl/taxi_dma_psdpram.sv
 ../lib/taxi/src/apb/rtl/taxi_apb_if.sv
-../lib/taxi/src/apb/rtl/taxi_apb_interconnect.sv
+../lib/taxi/src/apb/rtl/taxi_apb_interconnect_1s.sv
 ../lib/taxi/src/axi/rtl/taxi_axil_interconnect_1s.f
 ../lib/taxi/src/axis/rtl/taxi_axis_async_fifo_adapter.f
 ../lib/taxi/src/axis/rtl/taxi_axis_arb_mux.f
diff --git a/src/cndm/rtl/cndm_micro_core.sv b/src/cndm/rtl/cndm_micro_core.sv
index 827a6c5..dcf30a7 100644
--- a/src/cndm/rtl/cndm_micro_core.sv
+++ b/src/cndm/rtl/cndm_micro_core.sv
@@ -389,7 +389,7 @@ taxi_apb_if #(
 )
 apb_port_dp_ctrl[PORT_OFFSET_DP+PORTS]();
 
-taxi_apb_interconnect #(
+taxi_apb_interconnect_1s #(
     .M_CNT($size(apb_port_dp_ctrl)),
     .ADDR_W(APB_DP_ADDR_W),
     .M_REGIONS(1),
diff --git a/src/cndm/rtl/cndm_micro_port.sv b/src/cndm/rtl/cndm_micro_port.sv
index 0451335..7224b37 100644
--- a/src/cndm/rtl/cndm_micro_port.sv
+++ b/src/cndm/rtl/cndm_micro_port.sv
@@ -136,7 +136,7 @@ taxi_apb_if #(
 )
 apb_dp_ctrl[3]();
 
-taxi_apb_interconnect #(
+taxi_apb_interconnect_1s #(
     .M_CNT($size(apb_dp_ctrl)),
     .ADDR_W(s_apb_dp_ctrl.ADDR_W),
     .M_REGIONS(1),