Catch up to the carp rewrite and refer to vhids instead of interfaces.

Pointy hat to: bjk
Submitted by: glebius
Approved by: hrs (mentor)