Update interfaces to use protocol 5/aliases