Should we rename HeaderEntry to Header ?