diff --git a/library/scripts/adi_ip.tcl b/library/scripts/adi_ip.tcl
index ace1f81e6..418d7ca2d 100644
--- a/library/scripts/adi_ip.tcl
+++ b/library/scripts/adi_ip.tcl
@@ -278,12 +278,12 @@ proc adi_ip_properties {ip_name} {
 
 proc adi_if_define {name} {
 
-  ipx::create_abstraction_definition ADI user ${name}_rtl 1.0
-  ipx::create_bus_definition ADI user $name 1.0
+  ipx::create_abstraction_definition analog.com interface ${name}_rtl 1.0
+  ipx::create_bus_definition analog.com interface $name 1.0
 
   set_property xml_file_name ${name}_rtl.xml [ipx::current_busabs]
   set_property xml_file_name ${name}.xml [ipx::current_busdef]
-  set_property bus_type_vlnv ADI:user:${name}:1.0 [ipx::current_busabs]
+  set_property bus_type_vlnv analog.com:interface:${name}:1.0 [ipx::current_busabs]
 
   ipx::save_abstraction_definition [ipx::current_busabs]
   ipx::save_bus_definition [ipx::current_busdef]
diff --git a/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl b/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl
index 5ca8237ed..adf19563d 100644
--- a/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl
+++ b/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl
@@ -24,7 +24,7 @@ set_property master_address_space_ref m_axi \
 for {set n 0} {$n < 16} {incr n} {
 
   if {($n%4) == 0} {
-  adi_if_infer_bus ADI:user:if_xcvr_cm master up_cm_${n} [list \
+  adi_if_infer_bus analog.com:interface:if_xcvr_cm master up_cm_${n} [list \
     "sel                 up_cm_sel_${n}         "\
     "enb                 up_cm_enb_${n}         "\
     "addr                up_cm_addr_${n}        "\
@@ -34,7 +34,7 @@ for {set n 0} {$n < 16} {incr n} {
     "ready               up_cm_ready_${n}       "]
   }
 
-  adi_if_infer_bus ADI:user:if_xcvr_cm master up_es_${n} [list \
+  adi_if_infer_bus analog.com:interface:if_xcvr_cm master up_es_${n} [list \
     "sel                 up_es_sel_${n}         "\
     "enb                 up_es_enb_${n}         "\
     "addr                up_es_addr_${n}        "\
@@ -43,7 +43,7 @@ for {set n 0} {$n < 16} {incr n} {
     "rdata               up_es_rdata_${n}       "\
     "ready               up_es_ready_${n}       "]
 
-  adi_if_infer_bus ADI:user:if_xcvr_ch master up_ch_${n} [list \
+  adi_if_infer_bus analog.com:interface:if_xcvr_ch master up_ch_${n} [list \
     "pll_locked          up_ch_pll_locked_${n}  "\
     "rst                 up_ch_rst_${n}         "\
     "user_ready          up_ch_user_ready_${n}  "\
diff --git a/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl b/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl
index e1a9da91e..6a49158e1 100644
--- a/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl
+++ b/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl
@@ -19,7 +19,7 @@ set_property driver_value 0 [ipx::get_ports -filter "direction==in" -of_objects
 for {set n 0} {$n < 16} {incr n} {
 
   if {($n%4) == 0} {
-  adi_if_infer_bus ADI:user:if_xcvr_cm slave up_cm_${n} [list \
+  adi_if_infer_bus analog.com:interface:if_xcvr_cm slave up_cm_${n} [list \
     "sel                 up_cm_sel_${n}         "\
     "enb                 up_cm_enb_${n}         "\
     "addr                up_cm_addr_${n}        "\
@@ -29,7 +29,7 @@ for {set n 0} {$n < 16} {incr n} {
     "ready               up_cm_ready_${n}       "]
   }
 
-  adi_if_infer_bus ADI:user:if_xcvr_cm slave up_es_${n} [list \
+  adi_if_infer_bus analog.com:interface:if_xcvr_cm slave up_es_${n} [list \
     "sel                 up_es_sel_${n}         "\
     "enb                 up_es_enb_${n}         "\
     "addr                up_es_addr_${n}        "\
@@ -38,7 +38,7 @@ for {set n 0} {$n < 16} {incr n} {
     "rdata               up_es_rdata_${n}       "\
     "ready               up_es_ready_${n}       "]
 
-  adi_if_infer_bus ADI:user:if_xcvr_ch slave up_rx_${n} [list \
+  adi_if_infer_bus analog.com:interface:if_xcvr_ch slave up_rx_${n} [list \
     "pll_locked          up_rx_pll_locked_${n}  "\
     "rst                 up_rx_rst_${n}         "\
     "user_ready          up_rx_user_ready_${n}  "\
@@ -55,7 +55,7 @@ for {set n 0} {$n < 16} {incr n} {
     "rdata               up_rx_rdata_${n}       "\
     "ready               up_rx_ready_${n}       "]
 
-  adi_if_infer_bus ADI:user:if_xcvr_ch slave up_tx_${n} [list \
+  adi_if_infer_bus analog.com:interface:if_xcvr_ch slave up_tx_${n} [list \
     "pll_locked          up_tx_pll_locked_${n}  "\
     "rst                 up_tx_rst_${n}         "\
     "user_ready          up_tx_user_ready_${n}  "\