diff --git a/example/ADM_PCIE_9V3/fpga_x8/Makefile b/example/ADM_PCIE_9V3/fpga_axi_x8/Makefile
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/Makefile
rename to example/ADM_PCIE_9V3/fpga_axi_x8/Makefile
diff --git a/example/ADM_PCIE_9V3/fpga_x8/README.md b/example/ADM_PCIE_9V3/fpga_axi_x8/README.md
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/README.md
rename to example/ADM_PCIE_9V3/fpga_axi_x8/README.md
diff --git a/example/ADM_PCIE_9V3/fpga_x8/common/vivado.mk b/example/ADM_PCIE_9V3/fpga_axi_x8/common/vivado.mk
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/common/vivado.mk
rename to example/ADM_PCIE_9V3/fpga_axi_x8/common/vivado.mk
diff --git a/example/ADM_PCIE_9V3/fpga_x8/driver/Makefile b/example/ADM_PCIE_9V3/fpga_axi_x8/driver/Makefile
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/driver/Makefile
rename to example/ADM_PCIE_9V3/fpga_axi_x8/driver/Makefile
diff --git a/example/ADM_PCIE_9V3/fpga_x8/driver/example_driver.c b/example/ADM_PCIE_9V3/fpga_axi_x8/driver/example_driver.c
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/driver/example_driver.c
rename to example/ADM_PCIE_9V3/fpga_axi_x8/driver/example_driver.c
diff --git a/example/ADM_PCIE_9V3/fpga_x8/driver/example_driver.h b/example/ADM_PCIE_9V3/fpga_axi_x8/driver/example_driver.h
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/driver/example_driver.h
rename to example/ADM_PCIE_9V3/fpga_axi_x8/driver/example_driver.h
diff --git a/example/ADM_PCIE_9V3/fpga_x8/fpga.xdc b/example/ADM_PCIE_9V3/fpga_axi_x8/fpga.xdc
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/fpga.xdc
rename to example/ADM_PCIE_9V3/fpga_axi_x8/fpga.xdc
diff --git a/example/ADM_PCIE_9V3/fpga_x8/fpga/Makefile b/example/ADM_PCIE_9V3/fpga_axi_x8/fpga/Makefile
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/fpga/Makefile
rename to example/ADM_PCIE_9V3/fpga_axi_x8/fpga/Makefile
diff --git a/example/ADM_PCIE_9V3/fpga_x8/ip/pcie4_uscale_plus_0.xci b/example/ADM_PCIE_9V3/fpga_axi_x8/ip/pcie4_uscale_plus_0.xci
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/ip/pcie4_uscale_plus_0.xci
rename to example/ADM_PCIE_9V3/fpga_axi_x8/ip/pcie4_uscale_plus_0.xci
diff --git a/example/ADM_PCIE_9V3/fpga_x8/lib/pcie b/example/ADM_PCIE_9V3/fpga_axi_x8/lib/pcie
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/lib/pcie
rename to example/ADM_PCIE_9V3/fpga_axi_x8/lib/pcie
diff --git a/example/ADM_PCIE_9V3/fpga_x8/rtl/axi_ram.v b/example/ADM_PCIE_9V3/fpga_axi_x8/rtl/axi_ram.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/rtl/axi_ram.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/rtl/axi_ram.v
diff --git a/example/ADM_PCIE_9V3/fpga_x8/rtl/axis_register.v b/example/ADM_PCIE_9V3/fpga_axi_x8/rtl/axis_register.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/rtl/axis_register.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/rtl/axis_register.v
diff --git a/example/ADM_PCIE_9V3/fpga_x8/rtl/debounce_switch.v b/example/ADM_PCIE_9V3/fpga_axi_x8/rtl/debounce_switch.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/rtl/debounce_switch.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/rtl/debounce_switch.v
diff --git a/example/ADM_PCIE_9V3/fpga_x8/rtl/fpga.v b/example/ADM_PCIE_9V3/fpga_axi_x8/rtl/fpga.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/rtl/fpga.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/rtl/fpga.v
diff --git a/example/ADM_PCIE_9V3/fpga_x8/rtl/fpga_core.v b/example/ADM_PCIE_9V3/fpga_axi_x8/rtl/fpga_core.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/rtl/fpga_core.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/rtl/fpga_core.v
diff --git a/example/ADM_PCIE_9V3/fpga_x8/rtl/sync_reset.v b/example/ADM_PCIE_9V3/fpga_axi_x8/rtl/sync_reset.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/rtl/sync_reset.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/rtl/sync_reset.v
diff --git a/example/ADM_PCIE_9V3/fpga_x8/rtl/sync_signal.v b/example/ADM_PCIE_9V3/fpga_axi_x8/rtl/sync_signal.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/rtl/sync_signal.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/rtl/sync_signal.v
diff --git a/example/ADM_PCIE_9V3/fpga_x8/tb/axis_ep.py b/example/ADM_PCIE_9V3/fpga_axi_x8/tb/axis_ep.py
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/tb/axis_ep.py
rename to example/ADM_PCIE_9V3/fpga_axi_x8/tb/axis_ep.py
diff --git a/example/ADM_PCIE_9V3/fpga_x8/tb/pcie.py b/example/ADM_PCIE_9V3/fpga_axi_x8/tb/pcie.py
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/tb/pcie.py
rename to example/ADM_PCIE_9V3/fpga_axi_x8/tb/pcie.py
diff --git a/example/ADM_PCIE_9V3/fpga_x8/tb/pcie_us.py b/example/ADM_PCIE_9V3/fpga_axi_x8/tb/pcie_us.py
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/tb/pcie_us.py
rename to example/ADM_PCIE_9V3/fpga_axi_x8/tb/pcie_us.py
diff --git a/example/ADM_PCIE_9V3/fpga_x8/tb/pcie_usp.py b/example/ADM_PCIE_9V3/fpga_axi_x8/tb/pcie_usp.py
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/tb/pcie_usp.py
rename to example/ADM_PCIE_9V3/fpga_axi_x8/tb/pcie_usp.py
diff --git a/example/ADM_PCIE_9V3/fpga_x8/tb/test_fpga_core.py b/example/ADM_PCIE_9V3/fpga_axi_x8/tb/test_fpga_core.py
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/tb/test_fpga_core.py
rename to example/ADM_PCIE_9V3/fpga_axi_x8/tb/test_fpga_core.py
diff --git a/example/ADM_PCIE_9V3/fpga_x8/tb/test_fpga_core.v b/example/ADM_PCIE_9V3/fpga_axi_x8/tb/test_fpga_core.v
similarity index 100%
rename from example/ADM_PCIE_9V3/fpga_x8/tb/test_fpga_core.v
rename to example/ADM_PCIE_9V3/fpga_axi_x8/tb/test_fpga_core.v
diff --git a/example/ExaNIC_X10/fpga/Makefile b/example/ExaNIC_X10/fpga_axi/Makefile
similarity index 100%
rename from example/ExaNIC_X10/fpga/Makefile
rename to example/ExaNIC_X10/fpga_axi/Makefile
diff --git a/example/ExaNIC_X10/fpga/README.md b/example/ExaNIC_X10/fpga_axi/README.md
similarity index 100%
rename from example/ExaNIC_X10/fpga/README.md
rename to example/ExaNIC_X10/fpga_axi/README.md
diff --git a/example/ExaNIC_X10/fpga/common/vivado.mk b/example/ExaNIC_X10/fpga_axi/common/vivado.mk
similarity index 100%
rename from example/ExaNIC_X10/fpga/common/vivado.mk
rename to example/ExaNIC_X10/fpga_axi/common/vivado.mk
diff --git a/example/ExaNIC_X10/fpga/driver/Makefile b/example/ExaNIC_X10/fpga_axi/driver/Makefile
similarity index 100%
rename from example/ExaNIC_X10/fpga/driver/Makefile
rename to example/ExaNIC_X10/fpga_axi/driver/Makefile
diff --git a/example/ExaNIC_X10/fpga/driver/example_driver.c b/example/ExaNIC_X10/fpga_axi/driver/example_driver.c
similarity index 100%
rename from example/ExaNIC_X10/fpga/driver/example_driver.c
rename to example/ExaNIC_X10/fpga_axi/driver/example_driver.c
diff --git a/example/ExaNIC_X10/fpga/driver/example_driver.h b/example/ExaNIC_X10/fpga_axi/driver/example_driver.h
similarity index 100%
rename from example/ExaNIC_X10/fpga/driver/example_driver.h
rename to example/ExaNIC_X10/fpga_axi/driver/example_driver.h
diff --git a/example/ExaNIC_X10/fpga/fpga.xdc b/example/ExaNIC_X10/fpga_axi/fpga.xdc
similarity index 100%
rename from example/ExaNIC_X10/fpga/fpga.xdc
rename to example/ExaNIC_X10/fpga_axi/fpga.xdc
diff --git a/example/ExaNIC_X10/fpga/fpga/Makefile b/example/ExaNIC_X10/fpga_axi/fpga/Makefile
similarity index 100%
rename from example/ExaNIC_X10/fpga/fpga/Makefile
rename to example/ExaNIC_X10/fpga_axi/fpga/Makefile
diff --git a/example/ExaNIC_X10/fpga/ip/pcie3_ultrascale_0.xci b/example/ExaNIC_X10/fpga_axi/ip/pcie3_ultrascale_0.xci
similarity index 100%
rename from example/ExaNIC_X10/fpga/ip/pcie3_ultrascale_0.xci
rename to example/ExaNIC_X10/fpga_axi/ip/pcie3_ultrascale_0.xci
diff --git a/example/ExaNIC_X10/fpga/lib/pcie b/example/ExaNIC_X10/fpga_axi/lib/pcie
similarity index 100%
rename from example/ExaNIC_X10/fpga/lib/pcie
rename to example/ExaNIC_X10/fpga_axi/lib/pcie
diff --git a/example/ExaNIC_X10/fpga/rtl/axi_ram.v b/example/ExaNIC_X10/fpga_axi/rtl/axi_ram.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/rtl/axi_ram.v
rename to example/ExaNIC_X10/fpga_axi/rtl/axi_ram.v
diff --git a/example/ExaNIC_X10/fpga/rtl/axis_register.v b/example/ExaNIC_X10/fpga_axi/rtl/axis_register.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/rtl/axis_register.v
rename to example/ExaNIC_X10/fpga_axi/rtl/axis_register.v
diff --git a/example/ExaNIC_X10/fpga/rtl/debounce_switch.v b/example/ExaNIC_X10/fpga_axi/rtl/debounce_switch.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/rtl/debounce_switch.v
rename to example/ExaNIC_X10/fpga_axi/rtl/debounce_switch.v
diff --git a/example/ExaNIC_X10/fpga/rtl/fpga.v b/example/ExaNIC_X10/fpga_axi/rtl/fpga.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/rtl/fpga.v
rename to example/ExaNIC_X10/fpga_axi/rtl/fpga.v
diff --git a/example/ExaNIC_X10/fpga/rtl/fpga_core.v b/example/ExaNIC_X10/fpga_axi/rtl/fpga_core.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/rtl/fpga_core.v
rename to example/ExaNIC_X10/fpga_axi/rtl/fpga_core.v
diff --git a/example/ExaNIC_X10/fpga/rtl/sync_reset.v b/example/ExaNIC_X10/fpga_axi/rtl/sync_reset.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/rtl/sync_reset.v
rename to example/ExaNIC_X10/fpga_axi/rtl/sync_reset.v
diff --git a/example/ExaNIC_X10/fpga/rtl/sync_signal.v b/example/ExaNIC_X10/fpga_axi/rtl/sync_signal.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/rtl/sync_signal.v
rename to example/ExaNIC_X10/fpga_axi/rtl/sync_signal.v
diff --git a/example/ExaNIC_X10/fpga/tb/axis_ep.py b/example/ExaNIC_X10/fpga_axi/tb/axis_ep.py
similarity index 100%
rename from example/ExaNIC_X10/fpga/tb/axis_ep.py
rename to example/ExaNIC_X10/fpga_axi/tb/axis_ep.py
diff --git a/example/ExaNIC_X10/fpga/tb/pcie.py b/example/ExaNIC_X10/fpga_axi/tb/pcie.py
similarity index 100%
rename from example/ExaNIC_X10/fpga/tb/pcie.py
rename to example/ExaNIC_X10/fpga_axi/tb/pcie.py
diff --git a/example/ExaNIC_X10/fpga/tb/pcie_us.py b/example/ExaNIC_X10/fpga_axi/tb/pcie_us.py
similarity index 100%
rename from example/ExaNIC_X10/fpga/tb/pcie_us.py
rename to example/ExaNIC_X10/fpga_axi/tb/pcie_us.py
diff --git a/example/ExaNIC_X10/fpga/tb/test_fpga_core.py b/example/ExaNIC_X10/fpga_axi/tb/test_fpga_core.py
similarity index 100%
rename from example/ExaNIC_X10/fpga/tb/test_fpga_core.py
rename to example/ExaNIC_X10/fpga_axi/tb/test_fpga_core.py
diff --git a/example/ExaNIC_X10/fpga/tb/test_fpga_core.v b/example/ExaNIC_X10/fpga_axi/tb/test_fpga_core.v
similarity index 100%
rename from example/ExaNIC_X10/fpga/tb/test_fpga_core.v
rename to example/ExaNIC_X10/fpga_axi/tb/test_fpga_core.v
diff --git a/example/VCU118/fpga_x8/Makefile b/example/VCU118/fpga_axi_x8/Makefile
similarity index 100%
rename from example/VCU118/fpga_x8/Makefile
rename to example/VCU118/fpga_axi_x8/Makefile
diff --git a/example/VCU118/fpga_x8/README.md b/example/VCU118/fpga_axi_x8/README.md
similarity index 100%
rename from example/VCU118/fpga_x8/README.md
rename to example/VCU118/fpga_axi_x8/README.md
diff --git a/example/VCU118/fpga_x8/common/vivado.mk b/example/VCU118/fpga_axi_x8/common/vivado.mk
similarity index 100%
rename from example/VCU118/fpga_x8/common/vivado.mk
rename to example/VCU118/fpga_axi_x8/common/vivado.mk
diff --git a/example/VCU118/fpga_x8/driver/Makefile b/example/VCU118/fpga_axi_x8/driver/Makefile
similarity index 100%
rename from example/VCU118/fpga_x8/driver/Makefile
rename to example/VCU118/fpga_axi_x8/driver/Makefile
diff --git a/example/VCU118/fpga_x8/driver/example_driver.c b/example/VCU118/fpga_axi_x8/driver/example_driver.c
similarity index 100%
rename from example/VCU118/fpga_x8/driver/example_driver.c
rename to example/VCU118/fpga_axi_x8/driver/example_driver.c
diff --git a/example/VCU118/fpga_x8/driver/example_driver.h b/example/VCU118/fpga_axi_x8/driver/example_driver.h
similarity index 100%
rename from example/VCU118/fpga_x8/driver/example_driver.h
rename to example/VCU118/fpga_axi_x8/driver/example_driver.h
diff --git a/example/VCU118/fpga_x8/fpga.xdc b/example/VCU118/fpga_axi_x8/fpga.xdc
similarity index 100%
rename from example/VCU118/fpga_x8/fpga.xdc
rename to example/VCU118/fpga_axi_x8/fpga.xdc
diff --git a/example/VCU118/fpga_x8/fpga/Makefile b/example/VCU118/fpga_axi_x8/fpga/Makefile
similarity index 100%
rename from example/VCU118/fpga_x8/fpga/Makefile
rename to example/VCU118/fpga_axi_x8/fpga/Makefile
diff --git a/example/VCU118/fpga_x8/ip/pcie4_uscale_plus_0.xci b/example/VCU118/fpga_axi_x8/ip/pcie4_uscale_plus_0.xci
similarity index 100%
rename from example/VCU118/fpga_x8/ip/pcie4_uscale_plus_0.xci
rename to example/VCU118/fpga_axi_x8/ip/pcie4_uscale_plus_0.xci
diff --git a/example/VCU118/fpga_x8/lib/pcie b/example/VCU118/fpga_axi_x8/lib/pcie
similarity index 100%
rename from example/VCU118/fpga_x8/lib/pcie
rename to example/VCU118/fpga_axi_x8/lib/pcie
diff --git a/example/VCU118/fpga_x8/rtl/axi_ram.v b/example/VCU118/fpga_axi_x8/rtl/axi_ram.v
similarity index 100%
rename from example/VCU118/fpga_x8/rtl/axi_ram.v
rename to example/VCU118/fpga_axi_x8/rtl/axi_ram.v
diff --git a/example/VCU118/fpga_x8/rtl/axis_register.v b/example/VCU118/fpga_axi_x8/rtl/axis_register.v
similarity index 100%
rename from example/VCU118/fpga_x8/rtl/axis_register.v
rename to example/VCU118/fpga_axi_x8/rtl/axis_register.v
diff --git a/example/VCU118/fpga_x8/rtl/debounce_switch.v b/example/VCU118/fpga_axi_x8/rtl/debounce_switch.v
similarity index 100%
rename from example/VCU118/fpga_x8/rtl/debounce_switch.v
rename to example/VCU118/fpga_axi_x8/rtl/debounce_switch.v
diff --git a/example/VCU118/fpga_x8/rtl/fpga.v b/example/VCU118/fpga_axi_x8/rtl/fpga.v
similarity index 100%
rename from example/VCU118/fpga_x8/rtl/fpga.v
rename to example/VCU118/fpga_axi_x8/rtl/fpga.v
diff --git a/example/VCU118/fpga_x8/rtl/fpga_core.v b/example/VCU118/fpga_axi_x8/rtl/fpga_core.v
similarity index 100%
rename from example/VCU118/fpga_x8/rtl/fpga_core.v
rename to example/VCU118/fpga_axi_x8/rtl/fpga_core.v
diff --git a/example/VCU118/fpga_x8/rtl/sync_reset.v b/example/VCU118/fpga_axi_x8/rtl/sync_reset.v
similarity index 100%
rename from example/VCU118/fpga_x8/rtl/sync_reset.v
rename to example/VCU118/fpga_axi_x8/rtl/sync_reset.v
diff --git a/example/VCU118/fpga_x8/rtl/sync_signal.v b/example/VCU118/fpga_axi_x8/rtl/sync_signal.v
similarity index 100%
rename from example/VCU118/fpga_x8/rtl/sync_signal.v
rename to example/VCU118/fpga_axi_x8/rtl/sync_signal.v
diff --git a/example/VCU118/fpga_x8/tb/axis_ep.py b/example/VCU118/fpga_axi_x8/tb/axis_ep.py
similarity index 100%
rename from example/VCU118/fpga_x8/tb/axis_ep.py
rename to example/VCU118/fpga_axi_x8/tb/axis_ep.py
diff --git a/example/VCU118/fpga_x8/tb/pcie.py b/example/VCU118/fpga_axi_x8/tb/pcie.py
similarity index 100%
rename from example/VCU118/fpga_x8/tb/pcie.py
rename to example/VCU118/fpga_axi_x8/tb/pcie.py
diff --git a/example/VCU118/fpga_x8/tb/pcie_us.py b/example/VCU118/fpga_axi_x8/tb/pcie_us.py
similarity index 100%
rename from example/VCU118/fpga_x8/tb/pcie_us.py
rename to example/VCU118/fpga_axi_x8/tb/pcie_us.py
diff --git a/example/VCU118/fpga_x8/tb/pcie_usp.py b/example/VCU118/fpga_axi_x8/tb/pcie_usp.py
similarity index 100%
rename from example/VCU118/fpga_x8/tb/pcie_usp.py
rename to example/VCU118/fpga_axi_x8/tb/pcie_usp.py
diff --git a/example/VCU118/fpga_x8/tb/test_fpga_core.py b/example/VCU118/fpga_axi_x8/tb/test_fpga_core.py
similarity index 100%
rename from example/VCU118/fpga_x8/tb/test_fpga_core.py
rename to example/VCU118/fpga_axi_x8/tb/test_fpga_core.py
diff --git a/example/VCU118/fpga_x8/tb/test_fpga_core.v b/example/VCU118/fpga_axi_x8/tb/test_fpga_core.v
similarity index 100%
rename from example/VCU118/fpga_x8/tb/test_fpga_core.v
rename to example/VCU118/fpga_axi_x8/tb/test_fpga_core.v