#define ZERO (0x0)
 #define ONE  (1U)
 
-static const ib_buffer_t   IB_BUFFER_NULL = {0, 0, 0 };
+static const isp2400_ib_buffer_t   IB_BUFFER_NULL = {0, 0, 0 };
 
 static input_system_err_t input_system_configure_channel(
     const channel_cfg_t                channel);
 static void capture_unit_configure(
     const input_system_ID_t                    ID,
     const sub_system_ID_t                      sub_id,
-    const ib_buffer_t *const cfg);
+    const isp2400_ib_buffer_t *const cfg);
 
 static void acquisition_unit_configure(
     const input_system_ID_t                    ID,
     const sub_system_ID_t                      sub_id,
-    const ib_buffer_t *const cfg);
+    const isp2400_ib_buffer_t *const cfg);
 
 static void ctrl_unit_configure(
     const input_system_ID_t                    ID,
        u32 current_address    = 0;
        u32 unallocated_memory = IB_CAPACITY_IN_WORDS;
 
-       ib_buffer_t     candidate_buffer_acq  = IB_BUFFER_NULL;
+       isp2400_ib_buffer_t     candidate_buffer_acq  = IB_BUFFER_NULL;
        u32 size_requested;
        input_system_config_flags_t     acq_already_specified = INPUT_SYSTEM_CFG_FLAG_RESET;
        input_system_csi_port_t port;
 static void capture_unit_configure(
     const input_system_ID_t                    ID,
     const sub_system_ID_t                      sub_id,
-    const ib_buffer_t *const cfg)
+    const isp2400_ib_buffer_t *const cfg)
 {
        assert(ID < N_INPUT_SYSTEM_ID);
        assert(/*(sub_id >= CAPTURE_UNIT0_ID) &&*/ (sub_id <=
 static void acquisition_unit_configure(
     const input_system_ID_t                    ID,
     const sub_system_ID_t                      sub_id,
-    const ib_buffer_t *const cfg)
+    const isp2400_ib_buffer_t *const cfg)
 {
        assert(ID < N_INPUT_SYSTEM_ID);
        assert(sub_id == ACQUISITION_UNIT0_ID);
 
  *************************************************/
 
 static bool create_input_system_channel(
-    input_system_cfg_t *cfg,
+    isp2401_input_system_cfg_t *cfg,
     bool                       metadata,
     input_system_channel_t     *channel);
 
     input_system_channel_t     *channel);
 
 static bool create_input_system_input_port(
-    input_system_cfg_t         *cfg,
+    isp2401_input_system_cfg_t         *cfg,
     input_system_input_port_t  *input_port);
 
 static void destroy_input_system_input_port(
 static bool calculate_input_system_channel_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     input_system_channel_cfg_t *channel_cfg,
     bool metadata);
 
 static bool calculate_input_system_input_port_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     input_system_input_port_cfg_t      *input_port_cfg);
 
 static bool acquire_sid(
     s32 lines_per_frame,
     s32 align_in_bytes,
     bool online,
-    ib_buffer_t *buf);
+    isp2401_ib_buffer_t *buf);
 
 static void release_ib_buffer(
-    ib_buffer_t *buf);
+    isp2401_ib_buffer_t *buf);
 
 static bool acquire_dma_channel(
     isys2401_dma_ID_t  dma_id,
 static bool calculate_tpg_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     pixelgen_tpg_cfg_t         *cfg);
 
 static bool calculate_prbs_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     pixelgen_prbs_cfg_t                *cfg);
 
 static bool calculate_fe_cfg(
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     csi_rx_frontend_cfg_t              *cfg);
 
 static bool calculate_be_cfg(
     const input_system_input_port_t    *input_port,
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     bool                               metadata,
     csi_rx_backend_cfg_t               *cfg);
 
 static bool calculate_stream2mmio_cfg(
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     bool                               metadata,
     stream2mmio_cfg_t          *cfg);
 
 static bool calculate_ibuf_ctrl_cfg(
     const input_system_channel_t       *channel,
     const input_system_input_port_t    *input_port,
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     ibuf_ctrl_cfg_t                    *cfg);
 
 static bool calculate_isys2401_dma_cfg(
     const input_system_channel_t       *channel,
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     isys2401_dma_cfg_t         *cfg);
 
 static bool calculate_isys2401_dma_port_cfg(
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     bool                               raw_packed,
     bool                               metadata,
     isys2401_dma_port_cfg_t            *cfg);
  *
  **************************************************/
 static bool create_input_system_channel(
-    input_system_cfg_t *cfg,
+    isp2401_input_system_cfg_t *cfg,
     bool                       metadata,
     input_system_channel_t     *me)
 {
 }
 
 static bool create_input_system_input_port(
-    input_system_cfg_t         *cfg,
+    isp2401_input_system_cfg_t         *cfg,
     input_system_input_port_t  *me)
 {
        csi_mipi_packet_type_t packet_type;
 static bool calculate_input_system_channel_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     input_system_channel_cfg_t *channel_cfg,
     bool metadata)
 {
 static bool calculate_input_system_input_port_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     input_system_input_port_cfg_t      *input_port_cfg)
 {
        bool rc;
     s32 lines_per_frame,
     s32 align_in_bytes,
     bool online,
-    ib_buffer_t *buf)
+    isp2401_ib_buffer_t *buf)
 {
        buf->stride = calculate_stride(bits_per_pixel, pixels_per_line, false,
                                       align_in_bytes);
 }
 
 static void release_ib_buffer(
-    ib_buffer_t *buf)
+    isp2401_ib_buffer_t *buf)
 {
        ia_css_isys_ibuf_rmgr_release(&buf->start_addr);
 }
 static bool calculate_tpg_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     pixelgen_tpg_cfg_t         *cfg)
 {
        memcpy(cfg, &isys_cfg->tpg_port_attr, sizeof(pixelgen_tpg_cfg_t));
 static bool calculate_prbs_cfg(
     input_system_channel_t             *channel,
     input_system_input_port_t  *input_port,
-    input_system_cfg_t         *isys_cfg,
+    isp2401_input_system_cfg_t         *isys_cfg,
     pixelgen_prbs_cfg_t                *cfg)
 {
        memcpy(cfg, &isys_cfg->prbs_port_attr, sizeof(pixelgen_prbs_cfg_t));
 }
 
 static bool calculate_fe_cfg(
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     csi_rx_frontend_cfg_t              *cfg)
 {
        cfg->active_lanes = isys_cfg->csi_port_attr.active_lanes;
 
 static bool calculate_be_cfg(
     const input_system_input_port_t    *input_port,
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     bool                               metadata,
     csi_rx_backend_cfg_t               *cfg)
 {
 }
 
 static bool calculate_stream2mmio_cfg(
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     bool                               metadata,
     stream2mmio_cfg_t          *cfg
 )
 static bool calculate_ibuf_ctrl_cfg(
     const input_system_channel_t       *channel,
     const input_system_input_port_t    *input_port,
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     ibuf_ctrl_cfg_t                    *cfg)
 {
        const s32 bits_per_byte = 8;
 
 static bool calculate_isys2401_dma_cfg(
     const input_system_channel_t       *channel,
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     isys2401_dma_cfg_t         *cfg)
 {
        cfg->channel    = channel->dma_channel;
 
 /* See also: ia_css_dma_configure_from_info() */
 static bool calculate_isys2401_dma_port_cfg(
-    const input_system_cfg_t   *isys_cfg,
+    const isp2401_input_system_cfg_t   *isys_cfg,
     bool                               raw_packed,
     bool                               metadata,
     isys2401_dma_port_cfg_t            *cfg)