diff --git a/rtl/controller/src/controller_wrapper_axil.sv b/rtl/controller/src/controller_wrapper_axil.sv
index d941c24..93c0e09 100644
--- a/rtl/controller/src/controller_wrapper_axil.sv
+++ b/rtl/controller/src/controller_wrapper_axil.sv
@@ -47,11 +47,11 @@ parameter int unsigned WRITE_STATUS_WIDTH = LEN_WIDTH + TAG_WIDTH + AXIS_ID_WIDT
     output logic                       adc_rst,
 
     // AXIS DMA
-    axis_if.master            m_axis_status_read,
-    axis_if.master            m_axis_status_write,
+    axis_if.slave            s_axis_status_read,
+    axis_if.slave            s_axis_status_write,
 
-    axis_if.slave             s_axis_desc_read,
-    axis_if.slave             s_axis_desc_write
+    axis_if.master             m_axis_desc_read,
+    axis_if.master             m_axis_desc_write
 );
 
     logic start, rst_soft, send_desc_read, send_desc_write, take_status_read, take_status_write, cfg_bus_valid, busy;
@@ -222,88 +222,88 @@ parameter int unsigned WRITE_STATUS_WIDTH = LEN_WIDTH + TAG_WIDTH + AXIS_ID_WIDT
     );
 
     // AXIS LOGIC TRANSFORMATION
-    axis_flat_to_if 
+    axis_if_to_flat
     #(
         .DATA_W(READ_STATUS_WIDTH),
         .ID_W(8),
         .DEST_W(8),
         .USER_W(1)
-    ) axis_flat_to_if_status_read
+    ) axis_if_to_flat_status_read
     (
-        .s_axis_tdata(status_read_cmd_in),
-        .s_axis_tkeep(),
-        .s_axis_tstrb(),
-        .s_axis_tlast(),
-        .s_axis_tid(),
-        .s_axis_tdest(),
-        .s_axis_tuser(),
-        .s_axis_tvalid(valid_status_read),
-        .s_axis_tready(ready_status_read),
+        .m_axis_tdata(status_read_cmd_in),
+        .m_axis_tkeep(),
+        .m_axis_tstrb(),
+        .m_axis_tlast(),
+        .m_axis_tid(),
+        .m_axis_tdest(),
+        .m_axis_tuser(),
+        .m_axis_tvalid(valid_status_read),
+        .m_axis_tready(ready_status_read),
 
-        .m_axis(m_axis_status_read)
+        .s_axis(s_axis_status_read)
     );
 
-        axis_flat_to_if 
+        axis_if_to_flat 
     #(
         .DATA_W(WRITE_STATUS_WIDTH),
         .ID_W(8),
         .DEST_W(8),
         .USER_W(1)
-    ) axis_flat_to_if_status_write
+    ) axis_if_to_flat_status_write
     (
-        .s_axis_tdata(status_write_cmd_in),
+        .m_axis_tdata(status_write_cmd_in),
+        .m_axis_tkeep(),
+        .m_axis_tstrb(),
+        .m_axis_tlast(),
+        .m_axis_tid(),
+        .m_axis_tdest(),
+        .m_axis_tuser(),
+        .m_axis_tvalid(valid_status_write),
+        .m_axis_tready(ready_status_write),
+
+        .s_axis(s_axis_status_write)
+    );
+
+    axis_flat_to_if 
+    #(
+        .DATA_W(READ_DESC_WIDTH),
+        .ID_W(8),
+        .DEST_W(8),
+        .USER_W(1)
+    ) axis_flat_to_if_desc_read
+    (
+        .m_axis(m_axis_desc_read),
+
+        .s_axis_tdata(desc_read_cmd_out),
         .s_axis_tkeep(),
         .s_axis_tstrb(),
         .s_axis_tlast(),
         .s_axis_tid(),
         .s_axis_tdest(),
         .s_axis_tuser(),
-        .s_axis_tvalid(valid_status_write),
-        .s_axis_tready(ready_status_write),
-
-        .m_axis(m_axis_status_write)
+        .s_axis_tvalid(valid_desc_read),
+        .s_axis_tready(ready_desc_read)
     );
 
-    axis_if_to_flat 
-    #(
-        .DATA_W(READ_DESC_WIDTH),
-        .ID_W(8),
-        .DEST_W(8),
-        .USER_W(1)
-    ) axis_if_to_flat_desc_read
-    (
-        .s_axis(s_axis_desc_read),
-
-        .m_axis_tdata(desc_read_cmd_out),
-        .m_axis_tkeep(),
-        .m_axis_tstrb(),
-        .m_axis_tlast(),
-        .m_axis_tid(),
-        .m_axis_tdest(),
-        .m_axis_tuser(),
-        .m_axis_tvalid(valid_desc_read),
-        .m_axis_tready(ready_desc_read)
-    );
-
-     axis_if_to_flat 
+     axis_flat_to_if 
     #(
         .DATA_W(WRITE_DESC_WIDTH),
         .ID_W(8),
         .DEST_W(8),
         .USER_W(1)
-    ) axis_if_to_flat_desc_write
+    ) axis_flat_to_if_desc_write
     (
-        .s_axis(s_axis_desc_write),
+        .m_axis(m_axis_desc_write),
 
-        .m_axis_tdata(desc_write_cmd_out),
-        .m_axis_tkeep(),
-        .m_axis_tstrb(),
-        .m_axis_tlast(),
-        .m_axis_tid(),
-        .m_axis_tdest(),
-        .m_axis_tuser(),
-        .m_axis_tvalid(valid_desc_write),
-        .m_axis_tready(ready_desc_write)
+        .s_axis_tdata(desc_write_cmd_out),
+        .s_axis_tkeep(),
+        .s_axis_tstrb(),
+        .s_axis_tlast(),
+        .s_axis_tid(),
+        .s_axis_tdest(),
+        .s_axis_tuser(),
+        .s_axis_tvalid(valid_desc_write),
+        .s_axis_tready(ready_desc_write)
     );
 
 endmodule
\ No newline at end of file