Use consistent naming in vpn suite