closes #6082
* fix: Add old names to platform for compatibility * Simplify code * fix: apply changes to definitions Co-authored-by: Igor Randjelovic <rigor789@gmail.com>