diff --git a/XilinxProcessorIPLib/drivers/tmrctr/data/tmrctr_tapp.tcl b/XilinxProcessorIPLib/drivers/tmrctr/data/tmrctr_tapp.tcl
index 352356c7..ee0ca170 100755
--- a/XilinxProcessorIPLib/drivers/tmrctr/data/tmrctr_tapp.tcl
+++ b/XilinxProcessorIPLib/drivers/tmrctr/data/tmrctr_tapp.tcl
@@ -66,7 +66,7 @@ proc gen_include_files {swproj mhsinst} {
         return ""
     }
     if {$swproj == 1} {
-        set iftmrintr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst]
+        set iftmrintr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst]
         if {$iftmrintr == 1} {
             set inc_file_lines {xtmrctr.h tmrctr_header.h tmrctr_intr_header.h}
         } else {
@@ -81,7 +81,7 @@ proc gen_src_files {swproj mhsinst} {
     return ""
   }
   if {$swproj == 1} {
-      set iftmrintr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst]
+      set iftmrintr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst]
       
       if {$iftmrintr == 1} {
           set inc_file_lines {examples/xtmrctr_selftest_example.c examples/xtmrctr_intr_example.c data/tmrctr_header.h data/tmrctr_intr_header.h}
@@ -104,7 +104,7 @@ proc gen_init_code {swproj mhsinst} {
     if {$swproj == 1} {
         
       set ipname [get_property NAME $mhsinst]
-      set iftmrintr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst]
+      set iftmrintr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst]
       if {$iftmrintr == 1} {
           set decl "   static XTmrCtr ${ipname}_Timer;"
           set inc_file_lines $decl
@@ -122,10 +122,10 @@ proc gen_testfunc_call {swproj mhsinst} {
         return ""
     }
 
-    set iftmrintr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst] 
+    set iftmrintr [::hsi::utils::is_ip_interrupting_current_proc $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 {
@@ -133,10 +133,10 @@ proc gen_testfunc_call {swproj mhsinst} {
     }
     
     if {$iftmrintr == 1} {
-       set intr_pin_name [get_pins -of_objects [get_cells $ipname]  -filter "TYPE==INTERRUPT"]
-       set intcname [::hsm::utils::get_connected_intr_cntrl $ipname  $intr_pin_name]
+       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 ""