fix some internal 'apple' names