Fix remaining FE typo's