- accomodate header rename

Please also merge the corresponding fix in vrouter tree