diff --git a/XilinxProcessorIPLib/drivers/qspips/data/qspips_tapp.tcl b/XilinxProcessorIPLib/drivers/qspips/data/qspips_tapp.tcl
index 306a7830..c2d2b64c 100755
--- a/XilinxProcessorIPLib/drivers/qspips/data/qspips_tapp.tcl
+++ b/XilinxProcessorIPLib/drivers/qspips/data/qspips_tapp.tcl
@@ -92,8 +92,8 @@ proc gen_testfunc_call {swproj mhsinst} {
     }
 
     set ipname [get_property NAME $mhsinst] 
-    set deviceid [::hsm::utils::get_ip_param_name $mhsinst "DEVICE_ID"]
-    set stdout [get_property CONFIG.STDOUT [get_os]]
+    set deviceid [::hsi::utils::get_ip_param_name $mhsinst "DEVICE_ID"]
+    set stdout [get_property CONFIG.STDOUT [hsi::get_os]]
     if { $stdout == "" || $stdout == "none" } {
        set hasStdout 0
     } else {
diff --git a/XilinxProcessorIPLib/drivers/scuwdt/data/scuwdt_tapp.tcl b/XilinxProcessorIPLib/drivers/scuwdt/data/scuwdt_tapp.tcl
index 23fcbeeb..b0b2761c 100755
--- a/XilinxProcessorIPLib/drivers/scuwdt/data/scuwdt_tapp.tcl
+++ b/XilinxProcessorIPLib/drivers/scuwdt/data/scuwdt_tapp.tcl
@@ -98,8 +98,13 @@ proc gen_testfunc_call {swproj mhsinst} {
     }
 
     set ipname [get_property NAME $mhsinst] 
+<<<<<<< HEAD
     set deviceid [::hsm::utils::get_ip_param_name $mhsinst "DEVICE_ID"]
     set stdout [get_property CONFIG.STDOUT [get_os]]
+=======
+    set deviceid [::hsi::utils::get_ip_param_name $mhsinst "DEVICE_ID"]
+    set stdout [get_property CONFIG.STDOUT [hsi::get_os]]
+>>>>>>> scuwdt : added namespace for all HSI TCL commands.
     if { $stdout == "" || $stdout == "none" } {
        set hasStdout 0
     } else {