Rename bgpvpn and l3vpn suites appropriately