Use new header. Fix names