Trying to tidy up a naming error