diff --git a/src/eth/example/VCU118/fpga/fpga/Makefile b/src/eth/example/VCU118/fpga/fpga/Makefile
index 0983319..a03d2dd 100644
--- a/src/eth/example/VCU118/fpga/fpga/Makefile
+++ b/src/eth/example/VCU118/fpga/fpga/Makefile
@@ -46,7 +46,7 @@ CONFIG_TCL_FILES = ./config.tcl
 include ../common/vivado.mk
 
 program: $(PROJECT).bit
-	echo "open_hw" > program.tcl
+	echo "open_hw_manager" > program.tcl
 	echo "connect_hw_server" >> program.tcl
 	echo "open_hw_target" >> program.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> program.tcl
@@ -70,7 +70,7 @@ $(PROJECT)_primary.mcs $(PROJECT)_secondary.mcs $(PROJECT)_primary.prm $(PROJECT
 	echo "Output: rev/$*_rev$$COUNT$$x"; done;
 
 flash: $(PROJECT)_primary.mcs $(PROJECT)_secondary.mcs $(PROJECT)_primary.prm $(PROJECT)_secondary.prm
-	echo "open_hw" > flash.tcl
+	echo "open_hw_manager" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
 	echo "open_hw_target" >> flash.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash.tcl
diff --git a/src/eth/example/VCU118/fpga/fpga_10g/Makefile b/src/eth/example/VCU118/fpga/fpga_10g/Makefile
index c67c83d..ec07ca0 100644
--- a/src/eth/example/VCU118/fpga/fpga_10g/Makefile
+++ b/src/eth/example/VCU118/fpga/fpga_10g/Makefile
@@ -46,7 +46,7 @@ CONFIG_TCL_FILES = ./config.tcl
 include ../common/vivado.mk
 
 program: $(PROJECT).bit
-	echo "open_hw" > program.tcl
+	echo "open_hw_manager" > program.tcl
 	echo "connect_hw_server" >> program.tcl
 	echo "open_hw_target" >> program.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> program.tcl
@@ -70,7 +70,7 @@ $(PROJECT)_primary.mcs $(PROJECT)_secondary.mcs $(PROJECT)_primary.prm $(PROJECT
 	echo "Output: rev/$*_rev$$COUNT$$x"; done;
 
 flash: $(PROJECT)_primary.mcs $(PROJECT)_secondary.mcs $(PROJECT)_primary.prm $(PROJECT)_secondary.prm
-	echo "open_hw" > flash.tcl
+	echo "open_hw_manager" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
 	echo "open_hw_target" >> flash.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash.tcl
diff --git a/src/eth/example/XUPP3R/fpga/fpga_XUPP3R/Makefile b/src/eth/example/XUPP3R/fpga/fpga_XUPP3R/Makefile
index ced0dcb..ce25b9f 100644
--- a/src/eth/example/XUPP3R/fpga/fpga_XUPP3R/Makefile
+++ b/src/eth/example/XUPP3R/fpga/fpga_XUPP3R/Makefile
@@ -61,7 +61,7 @@ include ../common/vivado.mk
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
 program: $(FPGA_TOP).bit
-	echo "open_hw" > program.tcl
+	echo "open_hw_manager" > program.tcl
 	echo "connect_hw_server" >> program.tcl
 	echo "open_hw_target" >> program.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> program.tcl
@@ -111,7 +111,7 @@ program: $(FPGA_TOP).bit
 	echo "Output: rev/$*_full_rev$$COUNT$$x"; done;
 
 flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
-	echo "open_hw" > flash.tcl
+	echo "open_hw_manager" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
 	echo "open_hw_target" >> flash.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash.tcl
@@ -135,7 +135,7 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	vivado -nojournal -nolog -mode batch -source flash.tcl
 
 flash%: $(FPGA_TOP)%.mcs $(FPGA_TOP)%.prm
-	echo "open_hw" > flash$*.tcl
+	echo "open_hw_manager" > flash$*.tcl
 	echo "connect_hw_server" >> flash$*.tcl
 	echo "open_hw_target" >> flash$*.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash$*.tcl
diff --git a/src/eth/example/XUPP3R/fpga/fpga_XUPP3R_10g/Makefile b/src/eth/example/XUPP3R/fpga/fpga_XUPP3R_10g/Makefile
index fbb1ad1..39580d2 100644
--- a/src/eth/example/XUPP3R/fpga/fpga_XUPP3R_10g/Makefile
+++ b/src/eth/example/XUPP3R/fpga/fpga_XUPP3R_10g/Makefile
@@ -61,7 +61,7 @@ include ../common/vivado.mk
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
 program: $(FPGA_TOP).bit
-	echo "open_hw" > program.tcl
+	echo "open_hw_manager" > program.tcl
 	echo "connect_hw_server" >> program.tcl
 	echo "open_hw_target" >> program.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> program.tcl
@@ -111,7 +111,7 @@ program: $(FPGA_TOP).bit
 	echo "Output: rev/$*_full_rev$$COUNT$$x"; done;
 
 flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
-	echo "open_hw" > flash.tcl
+	echo "open_hw_manager" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
 	echo "open_hw_target" >> flash.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash.tcl
@@ -135,7 +135,7 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	vivado -nojournal -nolog -mode batch -source flash.tcl
 
 flash%: $(FPGA_TOP)%.mcs $(FPGA_TOP)%.prm
-	echo "open_hw" > flash$*.tcl
+	echo "open_hw_manager" > flash$*.tcl
 	echo "connect_hw_server" >> flash$*.tcl
 	echo "open_hw_target" >> flash$*.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash$*.tcl
diff --git a/src/eth/example/XUPP3R/fpga/fpga_XUSP3S/Makefile b/src/eth/example/XUPP3R/fpga/fpga_XUSP3S/Makefile
index 26c1f54..358b6fd 100644
--- a/src/eth/example/XUPP3R/fpga/fpga_XUSP3S/Makefile
+++ b/src/eth/example/XUPP3R/fpga/fpga_XUSP3S/Makefile
@@ -61,7 +61,7 @@ include ../common/vivado.mk
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
 program: $(FPGA_TOP).bit
-	echo "open_hw" > program.tcl
+	echo "open_hw_manager" > program.tcl
 	echo "connect_hw_server" >> program.tcl
 	echo "open_hw_target" >> program.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> program.tcl
@@ -111,7 +111,7 @@ program: $(FPGA_TOP).bit
 	echo "Output: rev/$*_full_rev$$COUNT$$x"; done;
 
 flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
-	echo "open_hw" > flash.tcl
+	echo "open_hw_manager" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
 	echo "open_hw_target" >> flash.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash.tcl
@@ -135,7 +135,7 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	vivado -nojournal -nolog -mode batch -source flash.tcl
 
 flash%: $(FPGA_TOP)%.mcs $(FPGA_TOP)%.prm
-	echo "open_hw" > flash$*.tcl
+	echo "open_hw_manager" > flash$*.tcl
 	echo "connect_hw_server" >> flash$*.tcl
 	echo "open_hw_target" >> flash$*.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash$*.tcl
diff --git a/src/eth/example/XUPP3R/fpga/fpga_XUSP3S_10g/Makefile b/src/eth/example/XUPP3R/fpga/fpga_XUSP3S_10g/Makefile
index 818ead5..86a4180 100644
--- a/src/eth/example/XUPP3R/fpga/fpga_XUSP3S_10g/Makefile
+++ b/src/eth/example/XUPP3R/fpga/fpga_XUSP3S_10g/Makefile
@@ -61,7 +61,7 @@ include ../common/vivado.mk
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
 program: $(FPGA_TOP).bit
-	echo "open_hw" > program.tcl
+	echo "open_hw_manager" > program.tcl
 	echo "connect_hw_server" >> program.tcl
 	echo "open_hw_target" >> program.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> program.tcl
@@ -111,7 +111,7 @@ program: $(FPGA_TOP).bit
 	echo "Output: rev/$*_full_rev$$COUNT$$x"; done;
 
 flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
-	echo "open_hw" > flash.tcl
+	echo "open_hw_manager" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
 	echo "open_hw_target" >> flash.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash.tcl
@@ -135,7 +135,7 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	vivado -nojournal -nolog -mode batch -source flash.tcl
 
 flash%: $(FPGA_TOP)%.mcs $(FPGA_TOP)%.prm
-	echo "open_hw" > flash$*.tcl
+	echo "open_hw_manager" > flash$*.tcl
 	echo "connect_hw_server" >> flash$*.tcl
 	echo "open_hw_target" >> flash$*.tcl
 	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash$*.tcl