diff --git a/XilinxProcessorIPLib/drivers/emc/data/emc.tcl b/XilinxProcessorIPLib/drivers/emc/data/emc.tcl
index 3588ff02..f1957703 100755
--- a/XilinxProcessorIPLib/drivers/emc/data/emc.tcl
+++ b/XilinxProcessorIPLib/drivers/emc/data/emc.tcl
@@ -87,7 +87,7 @@ proc xdefine_canonical_xpars {drv_handle file_name drv_string args} {
 
     # Get the names of all the peripherals connected to this driver
     foreach periph $periphs {
-        set peripheral_name [string toupper [get_property NAME $periph]]
+        set peripheral_name [string toupper [common::get_property NAME $periph]]
         lappend peripherals $peripheral_name
     }
 
@@ -108,7 +108,7 @@ proc xdefine_canonical_xpars {drv_handle file_name drv_string args} {
 
     set i 0
     foreach periph $periphs {
-        set periph_name [string toupper [get_property NAME $periph]]
+        set periph_name [string toupper [common::get_property NAME $periph]]
 
         # Generate canonical definitions only for the peripherals whose
         # canonical name is not the same as hardware instance name
@@ -127,7 +127,7 @@ proc xdefine_canonical_xpars {drv_handle file_name drv_string args} {
                 # The commented out rvalue is the name of the instance-specific constant
                 # set rvalue [::hsi::utils::get_ip_param_name $periph $arg]
                 # The rvalue set below is the actual value of the parameter
-                set rvalue [get_property CONFIG.$arg $periph]
+                set rvalue [common::get_property CONFIG.$arg $periph]
                 if {[llength $rvalue] == 0} {
                     set rvalue 0
                 }
diff --git a/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl b/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl
index b82c4d39..13d7e5a2 100755
--- a/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl
+++ b/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl
@@ -95,8 +95,8 @@ proc gen_testfunc_call {swproj mhsinst} {
     return ""
   }
   
-  set ipname [get_property NAME $mhsinst]
-  set stdout [get_property CONFIG.STDOUT [hsi::get_os]]
+  set ipname [common::get_property NAME $mhsinst]
+  set stdout [common::get_property CONFIG.STDOUT [hsi::get_os]]
   if { $stdout == "" || $stdout == "none" } {
        set hasStdout 0
   } else {
@@ -108,7 +108,7 @@ proc gen_testfunc_call {swproj mhsinst} {
   set prog_memranges [hsi::get_mem_ranges -filter "IS_INSTRUCTION==1" $mhsinst]
   if {[string compare ${prog_memranges} ""] != 0} {
     foreach progmem $prog_memranges {
-      set baseaddrval [get_property CONFIG.${progmem} $mhsinst]
+      set baseaddrval [common::get_property CONFIG.${progmem} $mhsinst]
       append testfunc_call "
    /* 
     * MemoryTest routine will not be run for the memory at 
@@ -122,7 +122,7 @@ proc gen_testfunc_call {swproj mhsinst} {
   set romemranges [hsi::get_mem_ranges $mhsinst]
   if {[string compare ${romemranges} ""] != 0} {
     foreach romem $romemranges {
-      set baseaddrval [get_property CONFIG.${romem} $mhsinst]
+      set baseaddrval [common::get_property CONFIG.${romem} $mhsinst]
       append testfunc_call "
    /* 
     * MemoryTest routine will not be run for the memory at