Simplifying terminology in headers