Tidy up variable names.