diff --git a/examples/system/freertos/zynqmp_r5/CMakeLists.txt b/examples/system/freertos/xlnx_r5/CMakeLists.txt
similarity index 94%
rename from examples/system/freertos/zynqmp_r5/CMakeLists.txt
rename to examples/system/freertos/xlnx_r5/CMakeLists.txt
index eb67bf95..cf1008b5 100644
--- a/examples/system/freertos/zynqmp_r5/CMakeLists.txt
+++ b/examples/system/freertos/xlnx_r5/CMakeLists.txt
@@ -15,4 +15,4 @@ endif (NOT _lib_path)
 get_filename_component (_lib_path ${_lib_path} DIRECTORY)
 collect (PROJECT_LIB_DIRS ${_lib_path})
 
-add_subdirectory(zynqmp_amp_demo)
+add_subdirectory(amp_demo)
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt b/examples/system/freertos/xlnx_r5/amp_demo/CMakeLists.txt
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt
rename to examples/system/freertos/xlnx_r5/amp_demo/CMakeLists.txt
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h b/examples/system/freertos/xlnx_r5/amp_demo/common.h
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h
rename to examples/system/freertos/xlnx_r5/amp_demo/common.h
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/ipi_latency_demod.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c
rename to examples/system/freertos/xlnx_r5/amp_demo/ipi_latency_demod.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/ipi_shmem_demod.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
rename to examples/system/freertos/xlnx_r5/amp_demo/ipi_shmem_demod.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/libmetal_amp_demod.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c
rename to examples/system/freertos/xlnx_r5/amp_demo/libmetal_amp_demod.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/lscript.ld b/examples/system/freertos/xlnx_r5/amp_demo/lscript.ld
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/lscript.ld
rename to examples/system/freertos/xlnx_r5/amp_demo/lscript.ld
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/platform_config.h b/examples/system/freertos/xlnx_r5/amp_demo/platform_config.h
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/platform_config.h
rename to examples/system/freertos/xlnx_r5/amp_demo/platform_config.h
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_atomic_demod.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c
rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_atomic_demod.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_demod.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c
rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_demod.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_latency_demod.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c
rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_latency_demod.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_throughput_demod.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c
rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_throughput_demod.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.c b/examples/system/freertos/xlnx_r5/amp_demo/sys_init.c
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.c
rename to examples/system/freertos/xlnx_r5/amp_demo/sys_init.c
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.h b/examples/system/freertos/xlnx_r5/amp_demo/sys_init.h
similarity index 100%
rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.h
rename to examples/system/freertos/xlnx_r5/amp_demo/sys_init.h
diff --git a/examples/system/generic/zynqmp_r5/CMakeLists.txt b/examples/system/generic/xlnx_r5/CMakeLists.txt
similarity index 94%
rename from examples/system/generic/zynqmp_r5/CMakeLists.txt
rename to examples/system/generic/xlnx_r5/CMakeLists.txt
index 3f87873f..eea72c2a 100644
--- a/examples/system/generic/zynqmp_r5/CMakeLists.txt
+++ b/examples/system/generic/xlnx_r5/CMakeLists.txt
@@ -18,4 +18,4 @@ endif (NOT _lib_path)
 get_filename_component (_lib_path ${_lib_path} DIRECTORY)
 collect (PROJECT_LIB_DIRS ${_lib_path})
 
-add_subdirectory(zynqmp_amp_demo)
+add_subdirectory(amp_demo)
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt b/examples/system/generic/xlnx_r5/amp_demo/CMakeLists.txt
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt
rename to examples/system/generic/xlnx_r5/amp_demo/CMakeLists.txt
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h b/examples/system/generic/xlnx_r5/amp_demo/common.h
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h
rename to examples/system/generic/xlnx_r5/amp_demo/common.h
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c b/examples/system/generic/xlnx_r5/amp_demo/ipi_latency_demod.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c
rename to examples/system/generic/xlnx_r5/amp_demo/ipi_latency_demod.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c b/examples/system/generic/xlnx_r5/amp_demo/ipi_shmem_demod.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
rename to examples/system/generic/xlnx_r5/amp_demo/ipi_shmem_demod.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c b/examples/system/generic/xlnx_r5/amp_demo/libmetal_amp_demod.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c
rename to examples/system/generic/xlnx_r5/amp_demo/libmetal_amp_demod.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/lscript.ld b/examples/system/generic/xlnx_r5/amp_demo/lscript.ld
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/lscript.ld
rename to examples/system/generic/xlnx_r5/amp_demo/lscript.ld
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/platform_config.h b/examples/system/generic/xlnx_r5/amp_demo/platform_config.h
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/platform_config.h
rename to examples/system/generic/xlnx_r5/amp_demo/platform_config.h
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_atomic_demod.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c
rename to examples/system/generic/xlnx_r5/amp_demo/shmem_atomic_demod.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_demod.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c
rename to examples/system/generic/xlnx_r5/amp_demo/shmem_demod.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_latency_demod.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c
rename to examples/system/generic/xlnx_r5/amp_demo/shmem_latency_demod.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_throughput_demod.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c
rename to examples/system/generic/xlnx_r5/amp_demo/shmem_throughput_demod.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.c b/examples/system/generic/xlnx_r5/amp_demo/sys_init.c
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.c
rename to examples/system/generic/xlnx_r5/amp_demo/sys_init.c
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.h b/examples/system/generic/xlnx_r5/amp_demo/sys_init.h
similarity index 100%
rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.h
rename to examples/system/generic/xlnx_r5/amp_demo/sys_init.h
diff --git a/examples/system/linux/zynqmp/CMakeLists.txt b/examples/system/linux/xlnx/CMakeLists.txt
similarity index 100%
rename from examples/system/linux/zynqmp/CMakeLists.txt
rename to examples/system/linux/xlnx/CMakeLists.txt
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/CMakeLists.txt b/examples/system/linux/xlnx/zynqmp_amp_demo/CMakeLists.txt
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/CMakeLists.txt
rename to examples/system/linux/xlnx/zynqmp_amp_demo/CMakeLists.txt
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/common.h b/examples/system/linux/xlnx/zynqmp_amp_demo/common.h
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/common.h
rename to examples/system/linux/xlnx/zynqmp_amp_demo/common.h
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/ipi_latency_demo.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/ipi_latency_demo.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/ipi_shmem_demo.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/ipi_shmem_demo.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demo.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demo.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demo.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demod.c b/examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demod.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demod.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demod.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_atomic_demo.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_atomic_demo.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_demo.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_demo.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_latency_demo.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_latency_demo.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_throughput_demo.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_throughput_demo.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.c b/examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.c
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.c
rename to examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.c
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.h b/examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.h
similarity index 100%
rename from examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.h
rename to examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.h