Change the name of the fields and add starred