p-header and p-footer renamed