Modify variable names