Add Id field and reformat field names