diff --git a/README.md b/README.md
index fdc869e..8b5c4fe 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Zynq Ten-Gigabit Example
 ========================
 
-This repository contains an example project for two ZC706 boards communicating over a 10-Gigabit network, using optical transcievers in the SFP+ cages on the boards.
+This repository contains an example project for two ZC706 boards communicating over a 10-Gigabit network, using optical transceivers in the SFP+ cages on the boards.
 
 The project structure is as follows:
 
diff --git a/master_hw/block_design.tcl b/master_hw/block_design.tcl
index 3d8d225..5d32ce6 100644
--- a/master_hw/block_design.tcl
+++ b/master_hw/block_design.tcl
@@ -10,7 +10,7 @@
 ################################################################
 # Check if script is running in correct Vivado version.
 ################################################################
-set scripts_vivado_version 2015.2
+set scripts_vivado_version 2018.3
 set current_vivado_version [version -short]
 
 if { [string first $scripts_vivado_version $current_vivado_version] == -1 } {
@@ -155,7 +155,7 @@ proc create_root_design { parentCell } {
   set txp [ create_bd_port -dir O txp ]
 
   # Create instance: axi_10g_ethernet_0, and set properties
-  set axi_10g_ethernet_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_10g_ethernet:3.0 axi_10g_ethernet_0 ]
+  set axi_10g_ethernet_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_10g_ethernet:3.1 axi_10g_ethernet_0 ]
   set_property -dict [ list CONFIG.SupportLevel {1}  ] $axi_10g_ethernet_0
 
   # Create instance: axi_dma_0, and set properties
@@ -170,11 +170,11 @@ proc create_root_design { parentCell } {
   set_property -dict [ list CONFIG.NUM_MI {1} CONFIG.NUM_SI {3}  ] $axi_interconnect_1
 
   # Create instance: axis_data_fifo_0, and set properties
-  set axis_data_fifo_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:1.1 axis_data_fifo_0 ]
+  set axis_data_fifo_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:2.0 axis_data_fifo_0 ]
   set_property -dict [ list CONFIG.FIFO_DEPTH {2048} CONFIG.FIFO_MODE {2}  ] $axis_data_fifo_0
 
   # Create instance: axis_data_fifo_1, and set properties
-  set axis_data_fifo_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:1.1 axis_data_fifo_1 ]
+  set axis_data_fifo_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:2.0 axis_data_fifo_1 ]
   set_property -dict [ list CONFIG.FIFO_DEPTH {2048} CONFIG.FIFO_MODE {2}  ] $axis_data_fifo_1
 
   # Create instance: const_sig_detect_high, and set properties
diff --git a/master_hw/project.tcl b/master_hw/project.tcl
index 9c6a746..5ea4047 100644
--- a/master_hw/project.tcl
+++ b/master_hw/project.tcl
@@ -98,7 +98,7 @@ set_property "xelab.unifast" "" $obj
 
 # Create 'synth_1' run (if not found)
 if {[string equal [get_runs -quiet synth_1] ""]} {
-  create_run -name synth_1 -part xc7z045ffg900-2 -flow {Vivado Synthesis 2015} -strategy "Vivado Synthesis Defaults" -constrset constrs_1
+  create_run -name synth_1 -part xc7z045ffg900-2 -flow {Vivado Synthesis 2018} -strategy "Vivado Synthesis Defaults" -constrset constrs_1
 } else {
   set_property strategy "Vivado Synthesis Defaults" [get_runs synth_1]
   set_property flow "Vivado Synthesis 2015" [get_runs synth_1]
@@ -110,7 +110,7 @@ current_run -synthesis [get_runs synth_1]
 
 # Create 'impl_1' run (if not found)
 if {[string equal [get_runs -quiet impl_1] ""]} {
-  create_run -name impl_1 -part xc7z045ffg900-2 -flow {Vivado Implementation 2015} -strategy "Vivado Implementation Defaults" -constrset constrs_1 -parent_run synth_1
+  create_run -name impl_1 -part xc7z045ffg900-2 -flow {Vivado Implementation 2018} -strategy "Vivado Implementation Defaults" -constrset constrs_1 -parent_run synth_1
 } else {
   set_property strategy "Vivado Implementation Defaults" [get_runs impl_1]
   set_property flow "Vivado Implementation 2015" [get_runs impl_1]
diff --git a/slave_hw/block_design.tcl b/slave_hw/block_design.tcl
index eb8d13e..7e9b310 100644
--- a/slave_hw/block_design.tcl
+++ b/slave_hw/block_design.tcl
@@ -10,7 +10,7 @@
 ################################################################
 # Check if script is running in correct Vivado version.
 ################################################################
-set scripts_vivado_version 2015.2
+set scripts_vivado_version 2018.3
 set current_vivado_version [version -short]
 
 if { [string first $scripts_vivado_version $current_vivado_version] == -1 } {
@@ -155,7 +155,7 @@ proc create_root_design { parentCell } {
   set txp [ create_bd_port -dir O txp ]
 
   # Create instance: axi_10g_ethernet_0, and set properties
-  set axi_10g_ethernet_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_10g_ethernet:3.0 axi_10g_ethernet_0 ]
+  set axi_10g_ethernet_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_10g_ethernet:3.1 axi_10g_ethernet_0 ]
   set_property -dict [ list CONFIG.SupportLevel {1}  ] $axi_10g_ethernet_0
 
   # Create instance: axi_interconnect_0, and set properties
@@ -163,11 +163,11 @@ proc create_root_design { parentCell } {
   set_property -dict [ list CONFIG.NUM_MI {1}  ] $axi_interconnect_0
 
   # Create instance: axis_data_fifo_0, and set properties
-  set axis_data_fifo_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:1.1 axis_data_fifo_0 ]
+  set axis_data_fifo_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:2.0 axis_data_fifo_0 ]
   set_property -dict [ list CONFIG.FIFO_MODE {2}  ] $axis_data_fifo_0
 
   # Create instance: axis_data_fifo_1, and set properties
-  set axis_data_fifo_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:1.1 axis_data_fifo_1 ]
+  set axis_data_fifo_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:2.0 axis_data_fifo_1 ]
   set_property -dict [ list CONFIG.FIFO_MODE {2}  ] $axis_data_fifo_1
 
   # Create instance: proc_sys_reset_0, and set properties
diff --git a/slave_hw/project.tcl b/slave_hw/project.tcl
index b2192e2..5fbb202 100644
--- a/slave_hw/project.tcl
+++ b/slave_hw/project.tcl
@@ -98,7 +98,7 @@ set_property "xelab.unifast" "" $obj
 
 # Create 'synth_1' run (if not found)
 if {[string equal [get_runs -quiet synth_1] ""]} {
-  create_run -name synth_1 -part xc7z045ffg900-2 -flow {Vivado Synthesis 2015} -strategy "Vivado Synthesis Defaults" -constrset constrs_1
+  create_run -name synth_1 -part xc7z045ffg900-2 -flow {Vivado Synthesis 2018} -strategy "Vivado Synthesis Defaults" -constrset constrs_1
 } else {
   set_property strategy "Vivado Synthesis Defaults" [get_runs synth_1]
   set_property flow "Vivado Synthesis 2015" [get_runs synth_1]
@@ -110,7 +110,7 @@ current_run -synthesis [get_runs synth_1]
 
 # Create 'impl_1' run (if not found)
 if {[string equal [get_runs -quiet impl_1] ""]} {
-  create_run -name impl_1 -part xc7z045ffg900-2 -flow {Vivado Implementation 2015} -strategy "Vivado Implementation Defaults" -constrset constrs_1 -parent_run synth_1
+  create_run -name impl_1 -part xc7z045ffg900-2 -flow {Vivado Implementation 2018} -strategy "Vivado Implementation Defaults" -constrset constrs_1 -parent_run synth_1
 } else {
   set_property strategy "Vivado Implementation Defaults" [get_runs impl_1]
   set_property flow "Vivado Implementation 2015" [get_runs impl_1]