Tidy up some naming