Changing duplicated field names