diff --git a/XilinxProcessorIPLib/drivers/cpu/data/cpu.tcl b/XilinxProcessorIPLib/drivers/cpu/data/cpu.tcl
index 5d0d813e..bf8024f4 100755
--- a/XilinxProcessorIPLib/drivers/cpu/data/cpu.tcl
+++ b/XilinxProcessorIPLib/drivers/cpu/data/cpu.tcl
@@ -361,7 +361,9 @@ proc xdefine_addr_params_for_ext_intf {drvhandle file_name} {
                        set name [format "%s%s" $name $param]
                    }
 
-               puts $file_handle "#define $name $value"
+               set xparam_name [::hsi::utils::format_xparam_name $name]
+               puts $file_handle "#define $xparam_name $value"
+
            }
 
 	   set name [string toupper [common::get_property NAME $mem_range]]
@@ -375,7 +377,9 @@ proc xdefine_addr_params_for_ext_intf {drvhandle file_name} {
                        set name [format "%s%s" $name $param]
                    }
 
-               puts $file_handle "#define $name $value"
+               set xparam_name [::hsi::utils::format_xparam_name $name]
+	       puts $file_handle "#define $xparam_name $value"
+
            }