Rename variable names