NXP-14007: Fixing class naming convention