Modify Variable names