NXP-15052: Adjust naming