Change field names in Header and RawObject, add deltaPhi