Update the ID/TargetID with what they're stored as