Small naming tidy-ups