Should these header names be refactored?