Modify variable names for readability