Tidy up the names of things a bit more