Rename file
Refactor header messages