Name fixes in the header