Renaming headers is hard work