Clean up variable names.