diff --git a/XilinxProcessorIPLib/drivers/nandps/data/nandps.tcl b/XilinxProcessorIPLib/drivers/nandps/data/nandps.tcl
index be8f4230..bac318c4 100755
--- a/XilinxProcessorIPLib/drivers/nandps/data/nandps.tcl
+++ b/XilinxProcessorIPLib/drivers/nandps/data/nandps.tcl
@@ -59,10 +59,10 @@ proc generate {drv_handle} {
 #
 proc xdefine_zynq_include_file {drv_handle file_name drv_string args} {
     # Open include file
-    set file_handle [::hsm::utils::open_include_file $file_name]
+    set file_handle [::hsi::utils::open_include_file $file_name]
 
     # Get all peripherals connected to this driver
-    set periphs [::hsm::utils::get_common_driver_ips $drv_handle] 
+    set periphs [::hsi::utils::get_common_driver_ips $drv_handle]
 
     # Handle special cases
     set arg "NUM_INSTANCES"
@@ -70,7 +70,7 @@ proc xdefine_zynq_include_file {drv_handle file_name drv_string args} {
     if {$posn > -1} {
 	puts $file_handle "/* Definitions for driver [string toupper [get_property NAME $drv_handle]] */"
 	# Define NUM_INSTANCES
-	puts $file_handle "#define [::hsm::utils::get_driver_param_name $drv_string $arg] [llength $periphs]"
+	puts $file_handle "#define [::hsi::utils::get_driver_param_name $drv_string $arg] [llength $periphs]"
 	set args [lreplace $args $posn $posn]
     }
     # Check if it is a driver parameter
@@ -81,7 +81,7 @@ proc xdefine_zynq_include_file {drv_handle file_name drv_string args} {
 	if {[llength $value] == 0} {
 	    lappend newargs $arg
 	} else {
-	    puts $file_handle "#define [::hsm::utils::get_driver_param_name $drv_string $arg] [get_property CONFIG.$arg $drv_handle]"
+	    puts $file_handle "#define [::hsi::utils::get_driver_param_name $drv_string $arg] [get_property CONFIG.$arg $drv_handle]"
 	}
     }
     set args $newargs
@@ -98,13 +98,13 @@ proc xdefine_zynq_include_file {drv_handle file_name drv_string args} {
 	    } elseif {[string compare -nocase "C_SMC_BASEADDR" $arg] == 0} {
 		set value 0xE000E000
 	    } else {
-		set value [::hsm::utils::get_param_value $periph $arg]
+		set value [::hsi::utils::get_param_value $periph $arg]
 	    }
 	    if {[llength $value] == 0} {
 		set value 0
 	    }
-	    set value [::hsm::utils::format_addr_string $value $arg]
-	    set arg_name [::hsm::utils::get_ip_param_name $periph $arg]
+	    set value [::hsi::utils::format_addr_string $value $arg]
+	    set arg_name [::hsi::utils::get_ip_param_name $periph $arg]
 	    regsub "S_AXI_" $arg_name "" arg_name
 	    if {[string compare -nocase "HW_VER" $arg] == 0} {
                 puts $file_handle "#define $arg_name \"$value\""
@@ -125,10 +125,10 @@ proc xdefine_zynq_include_file {drv_handle file_name drv_string args} {
 #-----------------------------------------------------------------------------
 proc xdefine_zynq_canonical_xpars {drv_handle file_name drv_string args} {
     # Open include file
-    set file_handle [::hsm::utils::open_include_file $file_name]
+    set file_handle [::hsi::utils::open_include_file $file_name]
 
     # Get all the peripherals connected to this driver
-    set periphs [::hsm::utils::get_common_driver_ips $drv_handle]
+    set periphs [::hsi::utils::get_common_driver_ips $drv_handle]
 
     # Get the names of all the peripherals connected to this driver
     foreach periph $periphs {
@@ -163,23 +163,23 @@ proc xdefine_zynq_canonical_xpars {drv_handle file_name drv_string args} {
             set canonical_name [format "%s_%s" $drv_string [lindex $indices $i]]
 
             foreach arg $args {
-                set lvalue [::hsm::utils::get_driver_param_name $canonical_name $arg]
+                set lvalue [::hsi::utils::get_driver_param_name $canonical_name $arg]
                 # replace S_SXI_ with CPU_. This is a temporary fix. Revist when the
                 # S_AXI_DIST_BASEADDR is generated by the tools
                 regsub "S_AXI_" $lvalue "CPU_" lvalue
 
                 # The commented out rvalue is the name of the instance-specific constant
-                # set rvalue [::hsm::utils::get_ip_param_name $periph $arg]
+                # set rvalue [::hsi::utils::get_ip_param_name $periph $arg]
                 # The rvalue set below is the actual value of the parameter
                 if {[string compare -nocase "C_SMC_BASEADDR" $arg] == 0} {
                     set rvalue 0xE000E000
                 } else {
-                    set rvalue [::hsm::utils::get_param_value $periph $arg]
+                    set rvalue [::hsi::utils::get_param_value $periph $arg]
                 }
                 if {[llength $rvalue] == 0} {
                     set rvalue 0
                 }
-                set rvalue [::hsm::utils::format_addr_string $rvalue $arg]
+                set rvalue [::hsi::utils::format_addr_string $rvalue $arg]
     
                 puts $file_handle "#define $lvalue $rvalue"