NXP-14979: follow API simplification