Rename some variables in sort header directive