Make override names match the field names