Rename rule and fix header name