Tidy up variable names