Renaming sipity_header_id to header_id