Some headers was renamed