Modify variable names..