diff --git a/XilinxProcessorIPLib/drivers/gpio/data/gpio_tapp.tcl b/XilinxProcessorIPLib/drivers/gpio/data/gpio_tapp.tcl
index e1dff34c..18c0eecb 100755
--- a/XilinxProcessorIPLib/drivers/gpio/data/gpio_tapp.tcl
+++ b/XilinxProcessorIPLib/drivers/gpio/data/gpio_tapp.tcl
@@ -179,17 +179,17 @@ proc gen_testfunc_call {swproj mhsinst} {
     set gpio_intr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst]
     set gpio_isdual [get_property CONFIG.C_IS_DUAL $mhsinst]
     set all_inputs [get_property CONFIG.C_ALL_INPUTS $mhsinst]
-    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 {
        set hasStdout 1
     }
     if { ${gpio_intr} == 1 && ${all_inputs} == 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 ""