Rename header vars