Use consistent naming in vpn v6 suite