NXP-16147: renaming