NXP-10781: various refactoring typos