Some more naming optimisations.