Name consistency, vlan-id -> vlan