diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/Makefile b/packages/platforms/inventec/x86-64/d5254/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/Makefile
rename to packages/platforms/inventec/x86-64/d5254/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/Makefile b/packages/platforms/inventec/x86-64/d5254/modules/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/Makefile
rename to packages/platforms/inventec/x86-64/d5254/modules/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/PKG.yml b/packages/platforms/inventec/x86-64/d5254/modules/PKG.yml
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/PKG.yml
rename to packages/platforms/inventec/x86-64/d5254/modules/PKG.yml
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/Makefile b/packages/platforms/inventec/x86-64/d5254/modules/builds/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/Makefile
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/Makefile b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/Makefile
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/gpio-ich.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/gpio-ich.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/gpio-ich.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/gpio-ich.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/i2c-gpio.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/i2c-gpio.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/i2c-gpio.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/i2c-gpio.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_cpld.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_cpld.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_cpld.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_cpld.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_mux.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_mux.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_mux.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_mux.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_mux.h b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_mux.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_mux.h
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_mux.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_platform.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_platform.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_platform.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_platform.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_psoc.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_psoc.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_psoc.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_psoc.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_swps.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_swps.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_swps.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_swps.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_swps.h b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_swps.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_swps.h
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_swps.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_vpd.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_vpd.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_vpd.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_vpd.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_vpd.h b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_vpd.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/inv_vpd.h
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/inv_vpd.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/io_expander.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/io_expander.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/io_expander.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/io_expander.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/io_expander.h b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/io_expander.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/io_expander.h
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/io_expander.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/onie_tlvinfo.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/onie_tlvinfo.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/onie_tlvinfo.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/onie_tlvinfo.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/onie_tlvinfo.h b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/onie_tlvinfo.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/onie_tlvinfo.h
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/onie_tlvinfo.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/transceiver.c b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/transceiver.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/transceiver.c
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/transceiver.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/transceiver.h b/packages/platforms/inventec/x86-64/d5254/modules/builds/src/transceiver.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/modules/builds/src/transceiver.h
rename to packages/platforms/inventec/x86-64/d5254/modules/builds/src/transceiver.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/Makefile b/packages/platforms/inventec/x86-64/d5254/onlp/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/Makefile
rename to packages/platforms/inventec/x86-64/d5254/onlp/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/PKG.yml b/packages/platforms/inventec/x86-64/d5254/onlp/PKG.yml
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/PKG.yml
rename to packages/platforms/inventec/x86-64/d5254/onlp/PKG.yml
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/Makefile b/packages/platforms/inventec/x86-64/d5254/onlp/builds/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/Makefile
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/lib/.gitignore b/packages/platforms/inventec/x86-64/d5254/onlp/builds/lib/.gitignore
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/lib/.gitignore
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/lib/.gitignore
diff --git a/packages/platforms/inventec/x86-64/d5254/onlp/builds/lib/Makefile b/packages/platforms/inventec/x86-64/d5254/onlp/builds/lib/Makefile
new file mode 100644
index 00000000..88c276d6
--- /dev/null
+++ b/packages/platforms/inventec/x86-64/d5254/onlp/builds/lib/Makefile
@@ -0,0 +1,2 @@
+PLATFORM := x86-64-inventec-d5254
+include $(ONL)/packages/base/any/onlp/builds/platform/libonlp-platform.mk
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/onlpdump/.gitignore b/packages/platforms/inventec/x86-64/d5254/onlp/builds/onlps/.gitignore
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/onlpdump/.gitignore
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/onlps/.gitignore
diff --git a/packages/platforms/inventec/x86-64/d5254/onlp/builds/onlps/Makefile b/packages/platforms/inventec/x86-64/d5254/onlp/builds/onlps/Makefile
new file mode 100644
index 00000000..cef679c7
--- /dev/null
+++ b/packages/platforms/inventec/x86-64/d5254/onlp/builds/onlps/Makefile
@@ -0,0 +1,2 @@
+PLATFORM := x86-64-inventec-d5254
+include $(ONL)/packages/base/any/onlp/builds/platform/onlps.mk
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/.gitignore b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/.gitignore
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/.gitignore
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/.gitignore
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/.module b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/.module
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/.module
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/.module
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/Makefile b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/Makefile
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/auto/make.mk b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/auto/make.mk
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/auto/make.mk
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/auto/make.mk
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/auto/x86_64_inventec_d5254.yml b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/auto/x86_64_inventec_d5254.yml
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/auto/x86_64_inventec_d5254.yml
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/auto/x86_64_inventec_d5254.yml
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254.x b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254.x
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254.x
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254.x
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_config.h b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_config.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_config.h
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_config.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_dox.h b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_dox.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_dox.h
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_dox.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_porting.h b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_porting.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_porting.h
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/inc/x86_64_inventec_d5254/x86_64_inventec_d5254_porting.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/make.mk b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/make.mk
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/make.mk
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/make.mk
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/Makefile b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/Makefile
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/attributei.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/attributei.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/attributei.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/attributei.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/chassisi.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/chassisi.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/chassisi.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/chassisi.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/debug.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/debug.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/debug.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/debug.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/fani.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/fani.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/fani.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/fani.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/ledi.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/ledi.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/ledi.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/ledi.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/make.mk b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/make.mk
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/make.mk
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/make.mk
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.h b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.h
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/platform_lib.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/platformi.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/platformi.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/platformi.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/platformi.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/psui.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/psui.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/psui.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/psui.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/sfpi.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/sfpi.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/sfpi.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/sfpi.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/sysi.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/sysi.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/sysi.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/sysi.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/thermali.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/thermali.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/thermali.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/thermali.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_config.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_config.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_config.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_config.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_enums.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_enums.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_enums.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_enums.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_int.h b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_int.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_int.h
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_int.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.h b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.h
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.h
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_log.h
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_module.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_module.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_module.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_module.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_ucli.c b/packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_ucli.c
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_ucli.c
rename to packages/platforms/inventec/x86-64/d5254/onlp/builds/x86_64_inventec_d5254/module/src/x86_64_inventec_d5254_ucli.c
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/Makefile b/packages/platforms/inventec/x86-64/d5254/platform-config/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/Makefile
rename to packages/platforms/inventec/x86-64/d5254/platform-config/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/Makefile b/packages/platforms/inventec/x86-64/d5254/platform-config/r0/Makefile
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/Makefile
rename to packages/platforms/inventec/x86-64/d5254/platform-config/r0/Makefile
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/PKG.yml b/packages/platforms/inventec/x86-64/d5254/platform-config/r0/PKG.yml
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/PKG.yml
rename to packages/platforms/inventec/x86-64/d5254/platform-config/r0/PKG.yml
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/src/lib/healthstatus.sh b/packages/platforms/inventec/x86-64/d5254/platform-config/r0/src/lib/healthstatus.sh
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/src/lib/healthstatus.sh
rename to packages/platforms/inventec/x86-64/d5254/platform-config/r0/src/lib/healthstatus.sh
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/src/lib/x86-64-inventec-d5254-r0.yml b/packages/platforms/inventec/x86-64/d5254/platform-config/r0/src/lib/x86-64-inventec-d5254-r0.yml
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/src/lib/x86-64-inventec-d5254-r0.yml
rename to packages/platforms/inventec/x86-64/d5254/platform-config/r0/src/lib/x86-64-inventec-d5254-r0.yml
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/src/python/x86_64_inventec_d5254_r0/__init__.py b/packages/platforms/inventec/x86-64/d5254/platform-config/r0/src/python/x86_64_inventec_d5254_r0/__init__.py
similarity index 100%
rename from packages/platforms/inventec/x86-64/x86-64-inventec-d5254/platform-config/r0/src/python/x86_64_inventec_d5254_r0/__init__.py
rename to packages/platforms/inventec/x86-64/d5254/platform-config/r0/src/python/x86_64_inventec_d5254_r0/__init__.py
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/lib/Makefile b/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/lib/Makefile
deleted file mode 100644
index 4ad633a3..00000000
--- a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/lib/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-############################################################
-# <bsn.cl fy=2014 v=onl>
-#
-#           Copyright 2014 BigSwitch Networks, Inc.
-#
-# Licensed under the Eclipse Public License, Version 1.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#        http://www.eclipse.org/legal/epl-v10.html
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the
-# License.
-#
-# </bsn.cl>
-############################################################
-#
-#
-############################################################
-include $(ONL)/make/config.amd64.mk
-
-MODULE := libonlp-x86-64-inventec-d5254
-include $(BUILDER)/standardinit.mk
-
-DEPENDMODULES := AIM IOF x86_64_inventec_d5254 onlplib
-DEPENDMODULE_HEADERS := sff
-
-include $(BUILDER)/dependmodules.mk
-
-SHAREDLIB := libonlp-x86-64-inventec-d5254.so
-$(SHAREDLIB)_TARGETS := $(ALL_TARGETS)
-include $(BUILDER)/so.mk
-.DEFAULT_GOAL := $(SHAREDLIB)
-
-GLOBAL_CFLAGS += -I$(onlp_BASEDIR)/module/inc
-GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
-GLOBAL_CFLAGS += -fPIC
-GLOBAL_LINK_LIBS += -lpthread
-
-include $(BUILDER)/targets.mk
-
diff --git a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/onlpdump/Makefile b/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/onlpdump/Makefile
deleted file mode 100644
index 0f252b11..00000000
--- a/packages/platforms/inventec/x86-64/x86-64-inventec-d5254/onlp/builds/onlpdump/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-############################################################
-# <bsn.cl fy=2014 v=onl>
-#
-#           Copyright 2014 BigSwitch Networks, Inc.
-#
-# Licensed under the Eclipse Public License, Version 1.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#        http://www.eclipse.org/legal/epl-v10.html
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the
-# License.
-#
-# </bsn.cl>
-############################################################
-#
-#
-#
-############################################################
-include $(ONL)/make/config.amd64.mk
-
-.DEFAULT_GOAL := onlpdump
-
-MODULE := onlpdump
-include $(BUILDER)/standardinit.mk
-
-DEPENDMODULES := AIM IOF onlp x86_64_inventec_d5254 onlplib onlp_platform_defaults sff cjson cjson_util timer_wheel OS
-
-include $(BUILDER)/dependmodules.mk
-
-BINARY := onlpdump
-$(BINARY)_LIBRARIES := $(LIBRARY_TARGETS)
-include $(BUILDER)/bin.mk
-
-GLOBAL_CFLAGS += -DAIM_CONFIG_AIM_MAIN_FUNCTION=onlpdump_main
-GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
-GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MAIN=1
-GLOBAL_LINK_LIBS += -lpthread -lm
-
-include $(BUILDER)/targets.mk
-