diff --git a/XilinxProcessorIPLib/drivers/spi/data/spi.tcl b/XilinxProcessorIPLib/drivers/spi/data/spi.tcl
index e493caf3..4aa221b8 100755
--- a/XilinxProcessorIPLib/drivers/spi/data/spi.tcl
+++ b/XilinxProcessorIPLib/drivers/spi/data/spi.tcl
@@ -103,7 +103,7 @@ proc xdefine_axispi_include_file {drv_handle file_name drv_string} {
 }
 
 proc xdefine_axispi_params_instance {file_handle periph device_id} {
-	set ip [get_cells $periph] 
+	set ip [hsi::get_cells $periph]
     set xip_mode_value [get_property  CONFIG.C_XIP_MODE $ip]
     if {[llength $xip_mode_value] == 0} {
          set xip_mode_value 0
diff --git a/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl b/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl
index 0e270887..e8937e08 100755
--- a/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl
+++ b/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl
@@ -138,7 +138,7 @@ proc gen_testfunc_call {swproj mhsinst} {
 
   set ipname [get_property NAME $mhsinst] 
   set deviceid [::hsi::utils::get_ip_param_name $mhsinst "DEVICE_ID"]
-  set stdout [get_property CONFIG.STDOUT [get_os]]
+  set stdout [get_property CONFIG.STDOUT [hsi::get_os]]
   if { $stdout == "" || $stdout == "none" } {
        set hasStdout 0
   } else {
@@ -147,10 +147,10 @@ proc gen_testfunc_call {swproj mhsinst} {
   set spi_intr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst]
   
   if { ${spi_intr} == 1} {
-      set intr_pin_name [get_pins -of_objects [get_cells $ipname]  -filter "TYPE==INTERRUPT"]
+      set intr_pin_name [hsi::get_pins -of_objects [hsi::get_cells $ipname]  -filter "TYPE==INTERRUPT"]
       set intcname [::hsi::utils::get_connected_intr_cntrl $ipname  $intr_pin_name]
       set intcvar intc
-      set proc [get_property IP_NAME [get_cells [get_sw_processor]]]
+      set proc [get_property IP_NAME [hsi::get_cells [hsi::get_sw_processor]]]
   }
 
   set testfunc_call ""